[anjuta/git-shell: 82/82] Merge branch 'master' into git-shell

[James Liggett <jrliggett src gnome org>]

commit fb3b891342abc3b6d1342ca722e2c6501317e472
Merge: 47569f4 b82f63b
Author: James Liggett <jrliggett cox net>
Date:   Wed Jun 23 17:18:31 2010 -0700

    Merge branch 'master' into git-shell
    
    Conflicts:
    	manuals/anjuta-manual/fr/figures/print_preview.png
    	manuals/anjuta-manual/fr/fr.po
    	po/sl.po

 README                                             |   14 +-
 anjuta.doap                                        |    2 +-
 configure.in                                       |   10 +-
 libanjuta/Makefile.am                              |   50 +-
 libanjuta/anjuta-plugin.c                          |    2 +-
 libanjuta/anjuta-project.h                         |    4 +-
 libanjuta/anjuta-utils.c                           |    4 +-
 libanjuta/interfaces/anjuta-idl-compiler.pl        |   32 +-
 libanjuta/interfaces/libanjuta.idl                 |  990 +-
 manuals/anjuta-manual/fr/figures/display_macro.png |  Bin 0 -> 35133 bytes
 manuals/anjuta-manual/fr/figures/editor_guides.png |  Bin 0 -> 23702 bytes
 .../anjuta-manual/fr/figures/local_variables.png   |  Bin 0 -> 31769 bytes
 manuals/anjuta-manual/fr/figures/print_dlg.png     |  Bin 0 -> 35827 bytes
 manuals/anjuta-manual/fr/figures/print_preview.png |  Bin 154035 -> 129153 bytes
 manuals/anjuta-manual/fr/fr.po                     | 2533 ++--
 manuals/reference/libanjuta/libanjuta-docs.sgml    |    1 +
 plugins/class-inheritance/class-inherit.c          |  214 +-
 plugins/class-inheritance/plugin.h                 |    7 +
 plugins/debug-manager/breakpoints.c                |    8 +
 plugins/document-manager/anjuta-bookmarks.c        |   38 +-
 plugins/gdb/debugger.c                             |  286 +-
 plugins/gdb/debugger.h                             |   11 +-
 plugins/gdb/gdb.init                               |    3 +-
 .../language-support-cpp-java/cpp-java-assist.c    |  360 +-
 .../cxxparser/engine-parser-priv.h                 |   16 +-
 .../cxxparser/engine-parser.cpp                    |  228 +-
 plugins/language-support-cpp-java/plugin.c         |   28 +-
 plugins/language-support-js/Makefile.am            |    2 +-
 plugins/language-support-js/db-anjuta-symbol.c     |   51 +-
 plugins/symbol-db/Makefile.am                      |   20 +-
 plugins/symbol-db/benchmark/benchmark.c            |   55 +-
 .../symbol-db/libgda-extra/gda-data-model-concat.c |  366 -
 .../symbol-db/libgda-extra/gda-data-model-concat.h |   62 -
 plugins/symbol-db/plugin.c                         |  323 +-
 plugins/symbol-db/plugin.h                         |    8 +-
 plugins/symbol-db/symbol-db-engine-core.c          |   82 +-
 plugins/symbol-db/symbol-db-engine-core.h          |   36 +-
 plugins/symbol-db/symbol-db-engine-iterator-node.c |  502 -
 plugins/symbol-db/symbol-db-engine-iterator-node.h |  104 -
 plugins/symbol-db/symbol-db-engine-iterator.c      |  412 -
 plugins/symbol-db/symbol-db-engine-iterator.h      |  100 -
 plugins/symbol-db/symbol-db-engine-priv.h          |    4 +-
 plugins/symbol-db/symbol-db-engine-queries.c       | 2573 ---
 plugins/symbol-db/symbol-db-engine-queries.h       |  228 -
 plugins/symbol-db/symbol-db-engine-utils.c         |  258 +-
 plugins/symbol-db/symbol-db-engine-utils.h         |   48 +-
 plugins/symbol-db/symbol-db-engine.h               |    4 -
 plugins/symbol-db/symbol-db-iface.c                |  737 -
 plugins/symbol-db/symbol-db-iface.h                |  190 -
 plugins/symbol-db/symbol-db-model-file.c           |    4 +-
 plugins/symbol-db/symbol-db-model-file.h           |    9 -
 plugins/symbol-db/symbol-db-model-project.c        |   38 +-
 plugins/symbol-db/symbol-db-model-search.c         |  272 +
 plugins/symbol-db/symbol-db-model-search.h         |   56 +
 plugins/symbol-db/symbol-db-query-result.c         |  533 +
 plugins/symbol-db/symbol-db-query-result.h         |   68 +
 plugins/symbol-db/symbol-db-query.c                | 1325 ++
 plugins/symbol-db/symbol-db-query.h                |   59 +
 plugins/symbol-db/symbol-db-search-command.c       |  319 -
 plugins/symbol-db/symbol-db-search-command.h       |   91 -
 plugins/symbol-db/symbol-db-view-search.c          |  705 -
 plugins/symbol-db/symbol-db-view-search.h          |   75 -
 plugins/symbol-db/symbol-db-views.c                |   34 +
 plugins/symbol-db/symbol-db-views.h                |    5 +-
 po/es.po                                           | 1327 +-
 po/sl.po                                           |23217 ++++++++++----------
 po/th.po                                           | 2754 ++-
 src/anjuta-app.c                                   |   28 +-
 68 files changed, 19376 insertions(+), 22549 deletions(-)
---