[anjuta/git-shell: 115/117] Merge branch 'master' into git-shell
- From: James Liggett <jrliggett src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta/git-shell: 115/117] Merge branch 'master' into git-shell
- Date: Thu, 19 Aug 2010 03:59:12 +0000 (UTC)
commit fef835402b7366333688c505fa0a6eff52ac3810
Merge: b044eb9 0c38eee
Author: James Liggett <jrliggett cox net>
Date: Tue Aug 17 16:01:49 2010 -0700
Merge branch 'master' into git-shell
Conflicts:
po/sv.po
NEWS | 56 +
configure.in | 46 +-
libanjuta/Makefile.am | 2 +-
libanjuta/anjuta-launcher.c | 2 +-
libanjuta/anjuta-preferences.c | 2 +-
libanjuta/anjuta-preferences.h | 6 +-
libanjuta/anjuta-utils.c | 4 +-
libanjuta/anjuta-utils.h | 2 +-
libanjuta/interfaces/libanjuta.idl | 402 +-
manuals/anjuta-manual/C/authors.xml | 2 +-
manuals/anjuta-manual/es/es.po | 29 +-
plugins/Makefile.am | 6 +-
plugins/build-basic-autotools/plugin.c | 13 +-
plugins/class-gen/generator.c | 1 +
plugins/debug-manager/command.c | 66 +-
plugins/devhelp/plugin.c | 10 +-
plugins/document-manager/plugin.c | 2 +-
plugins/file-loader/dnd.c | 2 +-
plugins/file-wizard/file.c | 66 +-
plugins/file-wizard/file.h | 1 -
plugins/gdb/anjuta-gdb.ui | 10 +-
plugins/gdb/debugger.c | 128 +-
plugins/gdb/debugger.h | 70 +-
plugins/gdb/parser.c | 495 -
plugins/gdb/parser.h | 38 -
plugins/gdb/plugin.c | 77 +-
plugins/gdb/preferences.c | 10 +-
plugins/gtodo/callback.c | 4 +-
plugins/gtodo/interface.c | 76 +-
plugins/gtodo/list_tooltip.c | 2 +-
plugins/gtodo/main.h | 7 +-
plugins/gtodo/notification.c | 6 +-
plugins/gtodo/preferences.c | 185 +-
plugins/js-debugger/debugger-js.c | 28 +-
plugins/js-debugger/debugger-js.h | 14 +-
plugins/js-debugger/plugin.c | 63 +-
plugins/language-manager/languages.xml | 3 +
.../anjuta-language-cpp-java.ui | 2 +-
.../language-support-cpp-java/cpp-java-assist.c | 48 +-
plugins/language-support-python/Makefile.am | 52 +
.../anjuta-python-autocomplete.py | 71 +
plugins/language-support-python/plugin.c | 1388 +++
plugins/language-support-python/plugin.h | 85 +
plugins/language-support-python/python-assist.c | 1030 ++
plugins/language-support-python/python-assist.h | 76 +
.../python-plugin-properties.ui | 462 +
.../python-plugin.plugin.in | 11 +
plugins/language-support-python/python-plugin.xml | 12 +
plugins/language-support-python/python-utils.c | 78 +
plugins/language-support-python/python-utils.h | 28 +
plugins/language-support-python/python_plugin.png | Bin 0 -> 2946 bytes
plugins/language-support-vala/Makefile.am | 2 +-
plugins/language-support-vala/libanjuta-1.0.vapi | 267 +-
plugins/language-support-vala/locator.vala | 1 +
plugins/language-support-vala/plugin.vala | 41 +-
plugins/language-support-vala/provider.vala | 61 +-
plugins/language-support-vala/report.vala | 3 +
plugins/macro/Makefile.am | 58 -
plugins/macro/anjuta-macro.plugin.in | 6 -
plugins/macro/anjuta-macro.png | Bin 1046 -> 0 bytes
plugins/macro/anjuta-macro.ui | 339 -
plugins/macro/anjuta-macro.xml | 14 -
plugins/macro/macro-actions.c | 169 -
plugins/macro/macro-actions.h | 27 -
plugins/macro/macro-db.c | 486 -
plugins/macro/macro-db.h | 79 -
plugins/macro/macro-dialog.c | 352 -
plugins/macro/macro-dialog.h | 56 -
plugins/macro/macro-edit.c | 309 -
plugins/macro/macro-edit.h | 68 -
plugins/macro/macro-util.c | 332 -
plugins/macro/macro-util.h | 25 -
plugins/macro/macros.xml | 285 -
plugins/macro/plugin.c | 293 -
plugins/macro/plugin.h | 68 -
plugins/project-wizard/druid.c | 27 +-
plugins/project-wizard/property.c | 85 +-
plugins/project-wizard/templates/Makefile.am | 5 +-
.../project-wizard/templates/anjuta-plugin.wiz.in | 11 +-
.../templates/anjuta-plugin/configure.ac.tpl | 2 +-
plugins/project-wizard/templates/cpp.wiz.in | 17 +-
.../project-wizard/templates/cpp/configure.ac.tpl | 2 +-
.../project-wizard/templates/cpp/src/Makefile.am | 4 +-
plugins/project-wizard/templates/gcj.wiz.in | 19 +-
.../project-wizard/templates/gcj/configure.ac.tpl | 2 +-
.../project-wizard/templates/gnome-applet.wiz.in | 104 -
.../project-wizard/templates/gnome-applet/HACKING | 33 -
.../templates/gnome-applet/Makefile.am | 13 -
.../templates/gnome-applet/Makefile.am.tpl | 33 -
.../templates/gnome-applet/autogen.sh | 23 -
.../templates/gnome-applet/configure.ac.tpl | 45 -
.../gnome-applet/src/GNOME_Applet.server.in.in | 22 -
.../templates/gnome-applet/src/Makefile.am | 9 -
.../templates/gnome-applet/src/Makefile.am.tpl | 54 -
.../templates/gnome-applet/src/main.c | 44 -
plugins/project-wizard/templates/gtk.wiz.in | 8 -
plugins/project-wizard/templates/gtkmm.wiz.in | 17 +-
plugins/project-wizard/templates/java.wiz.in | 19 +-
.../project-wizard/templates/java/configure.ac.tpl | 2 +-
plugins/project-wizard/templates/library.wiz.in | 15 +-
.../templates/library/configure.ac.tpl | 2 +-
plugins/project-wizard/templates/minimal.wiz.in | 11 +-
.../templates/minimal/configure.ac.tpl | 2 +-
plugins/project-wizard/templates/pygtk-logo.png | Bin 0 -> 4825 bytes
plugins/project-wizard/templates/pygtk.wiz.in | 83 +
plugins/project-wizard/templates/pygtk/Makefile.am | 12 +
.../templates/pygtk/configure.ac.tpl | 67 +
.../templates/pygtk/data/Makefile.am | 5 +
.../project-wizard/templates/pygtk/data/project.ui | 39 +
.../{gnome-applet => pygtk}/po/Makefile.am | 2 +-
.../{gnome-applet => pygtk}/po/POTFILES.in | 3 +-
.../project-wizard/templates/pygtk/project.anjuta | 37 +
.../project-wizard/templates/pygtk/src/Makefile.am | 5 +
.../templates/pygtk/src/Makefile.am.tpl | 22 +
plugins/project-wizard/templates/pygtk/src/main.py | 45 +
plugins/project-wizard/templates/python.wiz.in | 17 +-
.../templates/python/configure.ac.tpl | 2 +-
plugins/project-wizard/templates/sdl.wiz.in | 5 -
plugins/project-wizard/templates/terminal.wiz.in | 13 +-
.../project-wizard/templates/terminal/Makefile.am | 3 +-
.../templates/terminal/configure.ac.tpl | 2 +-
.../templates/terminal/po/Makefile.am | 4 +-
.../templates/terminal/src/Makefile.am | 4 +-
plugins/project-wizard/templates/wxwin.wiz.in | 16 +-
.../templates/wxwin/configure.ac.tpl | 2 +-
plugins/project-wizard/templates/xlib-dock.wiz.in | 14 +-
plugins/project-wizard/templates/xlib.wiz.in | 14 +-
.../project-wizard/templates/xlib/configure.ac.tpl | 2 +-
plugins/python-loader/Makefile.am | 56 +
.../python-loader/anjuta-python-loader.plugin.in | 10 +
plugins/python-loader/plugin.c | 168 +
plugins/python-loader/plugin.h | 46 +
plugins/snippets-manager/Makefile.am | 80 +
.../anjuta-snippets-manager.plugin.in | 6 +
.../snippets-manager/anjuta-snippets-manager.png | Bin 0 -> 6496 bytes
plugins/snippets-manager/plugin.c | 972 ++
plugins/snippets-manager/plugin.h | 92 +
plugins/snippets-manager/snippet-variables-store.c | 719 ++
plugins/snippets-manager/snippet-variables-store.h | 110 +
plugins/snippets-manager/snippet.c | 1226 +++
plugins/snippets-manager/snippet.h | 124 +
plugins/snippets-manager/snippets-browser.c | 1215 +++
plugins/snippets-manager/snippets-browser.h | 83 +
plugins/snippets-manager/snippets-browser.ui | 45 +
plugins/snippets-manager/snippets-db.c | 2132 +++++
plugins/snippets-manager/snippets-db.h | 165 +
plugins/snippets-manager/snippets-editor.c | 2012 ++++
plugins/snippets-manager/snippets-editor.h | 72 +
plugins/snippets-manager/snippets-editor.ui | 575 ++
.../snippets-manager/snippets-global-variables.xml | 14 +
plugins/snippets-manager/snippets-group.c | 290 +
plugins/snippets-manager/snippets-group.h | 73 +
plugins/snippets-manager/snippets-import-export.c | 217 +
plugins/snippets-manager/snippets-import-export.h | 28 +
.../snippets-interaction-interpreter.c | 931 ++
.../snippets-interaction-interpreter.h | 72 +
.../snippets-manager-preferences.ui | 106 +
plugins/snippets-manager/snippets-manager-ui.xml | 16 +
plugins/snippets-manager/snippets-provider.c | 755 ++
plugins/snippets-manager/snippets-provider.h | 70 +
plugins/snippets-manager/snippets-xml-parser.c | 840 ++
plugins/snippets-manager/snippets-xml-parser.h | 36 +
plugins/snippets-manager/snippets.anjuta-snippets | 464 +
plugins/sourceview/anjuta-view.c | 2 +-
plugins/sourceview/sourceview-private.h | 3 +
plugins/sourceview/sourceview-provider.c | 3 +
plugins/sourceview/sourceview.c | 145 +-
plugins/symbol-db/anjuta-tags/Makefile.am | 2 +-
plugins/symbol-db/anjuta-tags/ctags-visitor.vala | 4 +-
plugins/symbol-db/plugin.c | 2 +-
plugins/symbol-db/symbol-db-engine-core.c | 6 +-
plugins/symbol-db/symbol-db-model-project.c | 7 +-
plugins/symbol-db/symbol-db-query.c | 2 +-
po/LINGUAS | 1 +
po/POTFILES.in | 20 +-
po/POTFILES.skip | 1 +
po/es.po | 1095 ++-
po/gl.po | 1167 ++-
po/hy.po |10078 ++++++++++++++++++++
po/id.po | 2376 +++--
po/sl.po | 1291 ++--
po/sv.po | 3213 ++++---
182 files changed, 34242 insertions(+), 8664 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
