[anjuta/git-shell: 138/151] Merge branch 'master' into git-shell
- From: James Liggett <jrliggett src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta/git-shell: 138/151] Merge branch 'master' into git-shell
- Date: Sat, 13 Nov 2010 09:24:12 +0000 (UTC)
commit d1ebbb4c06bdc9077791f784fe739c4b510f26ca
Merge: e4e2fb0 2686761
Author: James Liggett <jrliggett cox net>
Date: Mon Nov 8 19:28:53 2010 -0800
Merge branch 'master' into git-shell
Conflicts:
plugins/git/anjuta-git.ui
plugins/git/git-diff-dialog.c
plugins/git/git-log-dialog.c
plugins/git/git-ui-utils.c
.gitignore | 66 +-
ABOUT-NLS | 324 --
Makefile.am | 4 +-
autogen.sh | 27 +-
configure.in => configure.ac | 208 +-
libanjuta/Makefile.am | 60 +-
libanjuta/anjuta-launcher.c | 3 +-
libanjuta/anjuta-plugin-manager.c | 58 +-
libanjuta/anjuta-plugin-manager.h | 9 +-
libanjuta/anjuta-preferences.c | 1505 +-------
libanjuta/anjuta-preferences.h | 122 +-
libanjuta/anjuta-tabber.c | 76 +-
libanjuta/anjuta-utils.c | 18 +-
libanjuta/anjuta-utils.h | 3 +
libanjuta/cell-renderer-captioned-image.c | 19 +-
libanjuta/e-splash.c | 35 +-
libanjuta/interfaces/Makefile.am.iface | 6 +-
libanjuta/interfaces/libanjuta.idl | 2 +-
.../{libanjuta-1.0.pc.in => libanjuta-3.0.pc.in} | 8 +-
m4/.gitignore | 36 +
manuals/anjuta-manual/Makefile.am | 2 +-
manuals/anjuta-manual/de/de.po | 1113 +++---
manuals/anjuta-manual/es/es.po | 49 +-
manuals/anjuta-manual/sl/sl.po | 2390 ++++++++++++
plugins/Makefile.am | 57 +-
plugins/build-basic-autotools/Makefile.am | 1 +
.../anjuta-build-basic-autotools-plugin.ui | 53 +-
plugins/build-basic-autotools/build-options.c | 6 +-
plugins/build-basic-autotools/executer.c | 6 +-
plugins/build-basic-autotools/plugin.c | 87 +-
plugins/build-basic-autotools/plugin.h | 3 +
plugins/class-gen/combo-flags.c | 10 +-
plugins/class-gen/plugin.c | 9 +-
plugins/class-gen/window.c | 4 +-
plugins/cvs-plugin/Makefile.am | 3 +-
plugins/cvs-plugin/anjuta-cvs-plugin.ui | 6 +-
plugins/cvs-plugin/cvs-interface.c | 52 +-
plugins/cvs-plugin/plugin.c | 11 +-
plugins/cvs-plugin/plugin.h | 3 +
plugins/debug-manager/Makefile.am | 20 +-
.../debug-manager/anjuta-debug-manager.schemas.in | 18 -
plugins/debug-manager/anjuta-debug-manager.ui | 10 +-
plugins/debug-manager/chunk_view.c | 2 -
plugins/debug-manager/data_view.c | 54 +-
.../org.gnome.anjuta.debug-manager.gschema.xml.in | 8 +
plugins/debug-manager/sharedlib.c | 6 +-
plugins/debug-manager/signals.c | 6 +-
plugins/debug-manager/sparse_view.c | 55 +-
plugins/debug-manager/start.c | 19 +-
plugins/document-manager/Makefile.am | 4 +-
plugins/document-manager/action-callbacks.c | 42 +-
plugins/document-manager/anjuta-docman.c | 32 +-
plugins/document-manager/anjuta-docman.h | 3 +-
.../anjuta-document-manager.plugin.in | 2 +-
.../document-manager/anjuta-document-manager.ui | 14 +-
.../document-manager.gschema-part.xml | 24 +
plugins/document-manager/plugin.c | 394 +-
plugins/document-manager/plugin.h | 10 +-
plugins/document-manager/search-box.c | 52 +-
plugins/file-loader/plugin.c | 16 +-
plugins/file-manager/Makefile.am | 1 +
plugins/file-manager/file-manager.ui | 10 +-
plugins/file-manager/file-view.c | 2 +-
plugins/file-manager/plugin.c | 79 +-
plugins/file-manager/plugin.h | 2 +-
plugins/file-wizard/file.c | 3 +-
plugins/file-wizard/file.h | 3 +-
plugins/gbf-am/Makefile.am | 6 +-
plugins/gbf-am/gbf-am-parse.in | 14 +-
plugins/gbf-am/gbf-am-project.c | 6 +-
plugins/gbf-am/gbf-am-properties.h | 2 +-
plugins/gbf-mkfile/Makefile.am | 6 +-
plugins/gbf-mkfile/gbf-mkfile-project.c | 6 +
plugins/gdb/Makefile.am | 6 +-
plugins/gdb/plugin.c | 15 +-
plugins/gdb/preferences.c | 6 +-
plugins/gdb/utilities.h | 3 -
plugins/git/giggle-graph-renderer.c | 25 +-
plugins/glade/plugin.c | 2 +-
plugins/gtodo/Makefile.am | 5 +
plugins/gtodo/anjuta-gtodo.gschema-part.xml | 3 +
plugins/gtodo/callback.c | 9 +-
plugins/gtodo/interface.c | 131 +-
plugins/gtodo/list_tooltip.c | 57 -
plugins/gtodo/main.h | 2 +-
plugins/gtodo/notification.c | 4 +-
plugins/gtodo/preferences.c | 195 +-
plugins/language-manager/Makefile.am | 5 +-
plugins/language-manager/languages.xml | 2 +-
plugins/language-support-cpp-java/Makefile.am | 1 +
.../anjuta-language-cpp-java.ui | 104 +-
.../language-support-cpp-java/cpp-java-assist.c | 86 +-
.../language-support-cpp-java/cpp-java-assist.h | 2 +-
plugins/language-support-cpp-java/plugin.c | 207 +-
plugins/language-support-cpp-java/plugin.h | 2 +-
plugins/language-support-js/Makefile.am | 9 +-
.../anjuta-language-javascript.ui | 16 +-
plugins/language-support-js/plugin.c | 15 +-
plugins/language-support-js/plugin.h | 2 +-
plugins/language-support-js/prefs.h | 30 +
plugins/language-support-js/util.c | 13 +-
plugins/language-support-python/Makefile.am | 6 +-
plugins/language-support-python/plugin.c | 54 +-
plugins/language-support-python/plugin.h | 1 +
plugins/language-support-python/python-assist.c | 45 +-
plugins/language-support-python/python-assist.h | 3 +-
.../python-plugin-properties.ui | 18 +-
.../python-plugin.plugin.in | 2 +-
.../python.gschema-part.xml | 3 +
plugins/language-support-vala/plugin.vala | 5 +-
plugins/language-support-vala/provider.vala | 16 +-
plugins/message-view/Makefile.am | 1 +
.../message-view/anjuta-message-manager-plugin.ui | 122 +-
plugins/message-view/anjuta-msgman.c | 45 +-
plugins/message-view/anjuta-msgman.h | 6 +-
plugins/message-view/message-view.c | 77 +-
plugins/message-view/plugin.c | 100 +-
plugins/message-view/plugin.h | 1 +
plugins/project-manager/gbf-project-view.c | 27 +-
plugins/project-wizard/druid.c | 30 +-
plugins/project-wizard/property.c | 4 +-
plugins/run-program/Makefile.am | 5 +
plugins/run-program/anjuta-run-program.ui | 14 +-
plugins/run-program/execute.c | 18 +-
.../org.gnome.anjuta.run.gschema.xml.in | 8 +
plugins/run-program/parameters.c | 4 +-
plugins/search/Makefile.am | 4 +-
plugins/search/anjuta-search.ui | 359 +--
plugins/search/search-replace.c | 42 +-
plugins/search/search-replace.h | 5 -
plugins/search/search_preferences.c | 587 ---
plugins/search/search_preferences.h | 27 -
plugins/snippets-manager/Makefile.am | 10 +-
plugins/snippets-manager/plugin.c | 39 +-
plugins/snippets-manager/plugin.h | 2 +
plugins/snippets-manager/snippets-browser.c | 48 +-
plugins/snippets-manager/snippets-editor.c | 30 +-
plugins/sourceview/Makefile.am | 2 +
plugins/sourceview/anjuta-editor-sourceview.ui | 182 +-
plugins/sourceview/anjuta-view.c | 30 +-
plugins/sourceview/assist-tip.c | 2 +-
plugins/sourceview/plugin.c | 34 +-
plugins/sourceview/plugin.h | 1 +
plugins/sourceview/sourceview-io.c | 4 +-
plugins/sourceview/sourceview-prefs.c | 422 +--
plugins/sourceview/sourceview-print.c | 149 +-
plugins/sourceview/sourceview-private.h | 4 +-
plugins/sourceview/sourceview.c | 32 +-
plugins/sourceview/sourceview.gschema-part.xml | 18 +
plugins/starter/Makefile.am | 2 -
plugins/starter/starter.c | 23 +-
plugins/subversion/subversion-commit-dialog.c | 4 +-
plugins/subversion/subversion-log-dialog.c | 2 +-
plugins/symbol-db/Makefile.am | 6 +-
plugins/symbol-db/anjuta-symbol-db.ui | 6 +-
plugins/symbol-db/anjuta-tags/Makefile.am | 4 +-
plugins/symbol-db/plugin.c | 22 +-
plugins/symbol-db/plugin.h | 2 +-
plugins/symbol-db/symbol-db-model.h | 2 +-
plugins/symbol-db/symbol-db-prefs.c | 20 +-
plugins/symbol-db/symbol-db-prefs.h | 12 +-
plugins/symbol-db/symbol-db-views.c | 2 +-
plugins/terminal/Makefile.am | 2 +-
plugins/terminal/anjuta-terminal-plugin.ui | 2 +-
plugins/terminal/terminal.c | 155 +-
plugins/tools/Makefile.am | 4 +
plugins/tools/editor.c | 20 +-
plugins/tools/plugin.c | 19 +-
po/POTFILES.in | 1 +
po/ca valencia po | 3929 ++++++++++++--------
po/de.po | 557 ++--
po/el.po | 184 +-
po/es.po | 422 ++--
po/id.po | 386 +-
po/ja.po | 282 +-
po/sl.po | 485 ++--
po/th.po | 2909 ++++++++-------
scripts/build-schemas.mk | 32 +-
scripts/builder2schema.pl | 99 +-
src/Makefile.am | 11 +-
src/action-callbacks.c | 8 +-
src/anjuta-app.c | 129 +-
src/anjuta-app.h | 1 +
src/anjuta.c | 22 +-
src/anjuta.gschema-part.xml | 6 +
src/preferences.ui | 221 +-
186 files changed, 10892 insertions(+), 10091 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
