[anjuta/git-shell: 207/234] Merge with 2.30 release candidate



commit 85425ac20bb5d5c476c2673106ef343cc3a669f8
Merge: f56d36d 5f53375
Author: James Liggett <jrliggett cox net>
Date:   Wed Mar 24 17:17:58 2010 -0700

    Merge with 2.30 release candidate
    
    Merge branch 'master' into git-shell

 NEWS                                               |   50 +-
 configure.in                                       |   29 +-
 doc/anjuta.1.in                                    |   35 +-
 libanjuta/anjuta-plugin-manager.c                  |    4 +-
 libanjuta/anjuta-preferences.c                     |    4 +-
 libanjuta/anjuta-project.c                         |    4 +-
 libanjuta/anjuta-project.h                         |    4 +-
 libanjuta/gbf-project.h                            |   10 +-
 libanjuta/interfaces/libanjuta.idl                 |   32 +-
 manuals/anjuta-manual/de/de.po                     | 1401 +++---
 manuals/reference/libanjuta/Makefile.am            |    6 +-
 manuals/reference/libanjuta/libanjuta-sections.txt | 2020 -------
 manuals/reference/libanjuta/libanjuta.types        |  111 -
 plugins/build-basic-autotools/plugin.c             |   86 +-
 plugins/build-basic-autotools/program.c            |    5 +-
 plugins/document-manager/Makefile.am               |    1 +
 plugins/file-manager/file-model.c                  |    3 +-
 plugins/file-manager/file-view.c                   |    8 +-
 plugins/gbf-am/Makefile.am                         |    1 +
 plugins/gbf-mkfile/Makefile.am                     |    1 +
 plugins/gbf-mkfile/plugin.c                        |    1 -
 plugins/language-manager/Makefile.am               |    3 +-
 plugins/language-manager/languages.xml             |   12 +-
 plugins/language-manager/plugin.c                  |   16 +
 .../anjuta-language-cpp-java.ui                    |  122 +-
 .../language-support-cpp-java/cpp-java-assist.c    | 1724 ++++---
 .../language-support-cpp-java/cpp-java-assist.h    |    2 -
 .../cxxparser/engine-parser.cpp                    |    2 +-
 plugins/language-support-cpp-java/plugin.c         |   48 +-
 plugins/language-support-cpp-java/plugin.h         |    3 +
 plugins/language-support-js/Makefile.am            |    1 +
 plugins/language-support-js/plugin.c               |    2 +-
 plugins/macro/Makefile.am                          |    1 +
 plugins/macro/anjuta-macro.ui                      |    2 +-
 plugins/message-view/anjuta-msgman.c               |    5 +-
 plugins/message-view/message-view.c                |   10 +-
 plugins/project-import/project-import.ui           |    1 +
 plugins/project-manager/gbf-project-model.c        |   10 +-
 plugins/project-manager/gbf-project-util.c         |    4 +-
 plugins/project-manager/gbf-project-view.c         |    2 +-
 plugins/project-manager/gbf-tree-data.c            |    2 +-
 plugins/project-manager/plugin.c                   |   20 +-
 .../templates/js_minimal/configure.ac.tpl          |    2 +-
 .../templates/js_minimal/src/debug.c               |   10 +-
 .../templates/js_minimal/src/main.js               |    5 +-
 .../templates/translatable-strings.h               |   33 +-
 plugins/sourceview/anjuta-editor-sourceview.ui     |   13 +-
 plugins/sourceview/anjuta-view.c                   |   20 +-
 plugins/sourceview/sourceview-cell.c               |  131 +-
 plugins/sourceview/sourceview-prefs.c              |   25 +-
 plugins/sourceview/sourceview-provider.c           |   13 +-
 plugins/sourceview/sourceview.c                    |   16 +-
 plugins/starter/Makefile.am                        |    3 +-
 plugins/starter/plugin.c                           |   73 +-
 plugins/starter/plugin.h                           |    1 +
 plugins/starter/starter.c                          |   13 +
 plugins/symbol-db/Makefile.am                      |   63 +-
 plugins/symbol-db/anjuta-tags/Makefile.am          |   14 +-
 plugins/symbol-db/anjuta-tags/ctags-visitor.vala   |  397 ++
 plugins/symbol-db/anjuta-tags/parsers.h            |   48 +
 plugins/symbol-db/anjuta-tags/vala.c               |  102 +
 plugins/symbol-db/plugin.c                         |  353 +-
 plugins/symbol-db/plugin.h                         |   11 +-
 plugins/symbol-db/symbol-db-engine-core.c          |  225 +-
 plugins/symbol-db/symbol-db-engine-core.h          |    3 +
 plugins/symbol-db/symbol-db-engine-iterator-node.c |    1 -
 plugins/symbol-db/symbol-db-engine-priv.h          |   47 +-
 plugins/symbol-db/symbol-db-engine-queries.c       |  134 +-
 plugins/symbol-db/symbol-db-engine-queries.h       |    4 +-
 plugins/symbol-db/symbol-db-engine-utils.c         |   16 +-
 plugins/symbol-db/symbol-db-iface.c                |   89 +-
 plugins/symbol-db/symbol-db-marshal.list           |    3 +
 plugins/symbol-db/symbol-db-model-file.c           |  218 +
 plugins/symbol-db/symbol-db-model-file.h           |   62 +
 plugins/symbol-db/symbol-db-model-project.c        |  417 ++
 plugins/symbol-db/symbol-db-model-project.h        |   63 +
 plugins/symbol-db/symbol-db-model.c                | 1265 +++++
 plugins/symbol-db/symbol-db-model.h                |   93 +
 plugins/symbol-db/symbol-db-search-command.c       |   43 +-
 plugins/symbol-db/symbol-db-search-command.h       |    3 +
 plugins/symbol-db/symbol-db-view-locals.c          | 1602 ------
 plugins/symbol-db/symbol-db-view-locals.h          |   99 -
 plugins/symbol-db/symbol-db-view-search.c          |    1 -
 plugins/symbol-db/symbol-db-view.c                 | 1737 ------
 plugins/symbol-db/symbol-db-view.h                 |   89 -
 plugins/symbol-db/symbol-db-views.c                |  136 +
 plugins/symbol-db/symbol-db-views.h                |   38 +
 po/POTFILES.in                                     |    2 -
 po/bg.po                                           | 3842 +++++++------
 po/ca.po                                           | 3069 +++++-----
 po/cs.po                                           | 5933 ++++++++++----------
 po/da.po                                           | 5023 +++++++++--------
 po/de.po                                           |  486 +-
 po/en_GB.po                                        | 2695 +++++-----
 po/es.po                                           |  787 ++--
 po/fr.po                                           | 2229 ++++----
 po/gl.po                                           | 2519 +++++----
 po/hu.po                                           | 3873 +++++++------
 po/it.po                                           | 4264 ++++++++-------
 po/pt.po                                           | 4664 +++++++++-------
 po/pt_BR.po                                        | 4135 ++++++++------
 po/ru.po                                           | 4108 +++++---------
 po/sl.po                                           |  494 +-
 po/sv.po                                           | 1540 +++---
 po/th.po                                           |    4 +-
 po/zh_HK.po                                        | 5075 +++++++++--------
 po/zh_TW.po                                        | 5086 +++++++++--------
 src/anjuta-app.c                                   |   37 +
 src/main.c                                         |   22 +-
 109 files changed, 36828 insertions(+), 36601 deletions(-)
---



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