[latexila/gnome-3: 15/16] Merge branch 'master' into gnome-3



commit 7a46c2ea520ed80da70ce8b3e7833d23b7004773
Merge: e7d336e 6c2dc73
Author: SÃbastien Wilmet <swilmet src gnome org>
Date:   Sun Mar 11 03:10:19 2012 +0100

    Merge branch 'master' into gnome-3
    
    Conflicts:
    	TODO
    	src/templates.vala

 TODO                       |   52 ----
 data/completion.xml        |   10 +
 src/build_tools.vala       |   34 +--
 src/completion.vala        |   13 +-
 src/latex_menu.vala        |   42 ++--
 src/latexila.vala          |   37 +---
 src/main_window.vala       |    9 +-
 src/most_used_symbols.vala |   23 +--
 src/projects.vala          |   28 +--
 src/templates.vala         |  638 ++++++++++++++++----------------------------
 src/templates_dialogs.vala |  301 +++++++++++++++++++++
 src/utils.vala             |   63 +++++-
 12 files changed, 672 insertions(+), 578 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]