• Sebastien Granjoux's avatar
    Merge branch 'master' into newproject · 5fb31c3a
    Sebastien Granjoux authored
    Conflicts:
    	plugins/Makefile.am
    	plugins/gbf-am/Makefile.am
    	plugins/mk-project/Makefile.am
    	plugins/project-manager/pkg-config.h
    #
    # It looks like you may be committing a MERGE.
    # If this is not correct, please remove the file
    #	.git/MERGE_HEAD
    # and try again.
    #
    
    # Please enter the commit message for your changes. Lines starting
    # with '#' will be ignored, and an empty message aborts the commit.
    # On branch newproject
    # Changes to be committed:
    #
    #	modified:   Makefile.am
    #	modified:   NEWS
    #	new file:   anjuta.jhbuildrc
    #	modified:   configure.ac
    #	modified:   libanjuta/Makefile.am
    #	modified:   libanjuta/anjuta-plugin-manager.c
    #	modified:   libanjuta/anjuta-tabber.c
    #	modified:   libanjuta/anjuta-utils.c
    #	modified:   libanjuta/cell-renderer-captioned-image.c
    #	modified:   libanjuta/e-splash.c
    #	modified:   libanjuta/interfaces/Makefile.am.iface
    #	renamed:    libanjuta/libanjuta-1.0.pc.in -> libanjuta/libanjuta-3.0.pc.in
    #	modified:   manuals/anjuta-manual/de/de.po
    #	modified:   manuals/anjuta-manual/th/th.po
    #	modified:   manuals/reference/libanjuta/Makefile.am
    #	modified:   plugins/Makefile.am
    #	modified:   plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui
    #	modified:   plugins/build-basic-autotools/build-options.c
    #	modified:   plugins/class-gen/combo-flags.c
    #	modified:   plugins/class-gen/window.c
    #	modified:   plugins/debug-manager/Makefile.am
    #	modified:   plugins/debug-manager/chunk_view.c
    #	modified:   plugins/debug-manager/data_view.c
    #	modified:   plugins/debug-manager/org.gnome.anjuta.debug-manager.gschema.xml.in
    #	modified:   plugins/debug-manager/sharedlib.c
    #	modified:   plugins/debug-manager/signals.c
    #	modified:   plugins/debug-manager/sparse_view.c
    #	modified:   plugins/debug-manager/start.c
    #	modified:   plugins/document-manager/Makefile.am
    #	modified:   plugins/document-manager/plugin.c
    #	modified:   plugins/document-manager/search-box.c
    #	modified:   plugins/file-loader/plugin.c
    #	modified:   plugins/file-manager/file-view.c
    #	modified:   plugins/gdb/Makefile.am
    #	modified:   plugins/gdb/preferences.c
    #	modified:   plugins/git/anjuta-git.ui
    #	modified:   plugins/git/giggle-graph-renderer.c
    #	modified:   plugins/git/git-diff-dialog.c
    #	modified:   plugins/git/git-log-dialog.c
    #	modified:   plugins/git/git-ui-utils.c
    #	modified:   plugins/glade/plugin.c
    #	modified:   plugins/language-manager/Makefile.am
    #	modified:   plugins/language-support-cpp-java/anjuta-language-cpp-java.ui
    #	modified:   plugins/language-support-cpp-java/plugin.c
    #	modified:   plugins/language-support-js/Makefile.am
    #	modified:   plugins/language-support-js/anjuta-language-javascript.ui
    #	modified:   plugins/language-support-js/plugin.c
    #	modified:   plugins/language-support-js/plugin.h
    #	new file:   plugins/language-support-js/prefs.h
    #	modified:   plugins/language-support-js/util.c
    #	modified:   plugins/language-support-python/Makefile.am
    #	modified:   plugins/language-support-vala/Makefile.am
    #	modified:   plugins/language-support-vala/plugin.vala
    #	modified:   plugins/language-support-vala/provider.vala
    #	modified:   plugins/message-view/anjuta-msgman.c
    #	modified:   plugins/message-view/message-view.c
    #	modified:   plugins/message-view/plugin.c
    #	modified:   plugins/mk-project/Makefile.am
    #	modified:   plugins/project-manager/project-view.c
    #	modified:   plugins/project-wizard/druid.c
    #	modified:   plugins/project-wizard/property.c
    #	modified:   plugins/run-program/Makefile.am
    #	modified:   plugins/run-program/anjuta-run-program.ui
    #	modified:   plugins/run-program/execute.c
    #	modified:   plugins/run-program/org.gnome.anjuta.run.gschema.xml.in
    #	modified:   plugins/run-program/parameters.c
    #	modified:   plugins/search/anjuta-search.ui
    #	modified:   plugins/search/search-replace.c
    #	modified:   plugins/snippets-manager/Makefile.am
    #	modified:   plugins/snippets-manager/plugin.c
    #	modified:   plugins/snippets-manager/snippets-browser.c
    #	modified:   plugins/snippets-manager/snippets-editor.c
    #	modified:   plugins/sourceview/Makefile.am
    #	modified:   plugins/sourceview/anjuta-view.c
    #	modified:   plugins/sourceview/assist-tip.c
    #	modified:   plugins/sourceview/sourceview-prefs.c
    #	modified:   plugins/sourceview/sourceview.c
    #	modified:   plugins/starter/starter.c
    #	modified:   plugins/subversion/subversion-commit-dialog.c
    #	modified:   plugins/subversion/subversion-log-dialog.c
    #	modified:   plugins/symbol-db/Makefile.am
    #	modified:   plugins/symbol-db/anjuta-tags/Makefile.am
    #	modified:   plugins/symbol-db/anjuta-tags/ctags-visitor.vala
    #	modified:   plugins/symbol-db/symbol-db-model.h
    #	modified:   plugins/symbol-db/symbol-db-views.c
    #	modified:   plugins/terminal/Makefile.am
    #	modified:   plugins/terminal/terminal.c
    #	modified:   plugins/tools/editor.c
    #	modified:   po/LINGUAS
    #	modified:   po/POTFILES.in
    #	modified:   po/es.po
    #	modified:   po/gl.po
    #	modified:   po/ja.po
    #	new file:   po/ug.po
    #	modified:   scripts/builder2schema.pl
    #	modified:   src/Makefile.am
    #	modified:   src/anjuta-app.c
    #	modified:   src/main.c
    #
    # Untracked files:
    #   (use "git add <file>..." to include in what will be committed)
    #
    #	.anjuta/
    #	.anjuta_sym_db.db
    #	ABOUT-NLS
    #	Debug/
    #	INSTALL
    #	Makefile.in
    #	aclocal.m4
    #	compile
    #	config.guess
    #	config.h.in
    #	config.rpath
    #	config.sub
    #	depcomp
    #	gnome-doc-utils.make
    #	gtk-doc.make
    #	install-sh
    #	libanjuta/interfaces/Makefile.am
    #	libanjuta/interfaces/Makefile.in
    #	libanjuta/interfaces/hierarchy.txt
    #	libanjuta/interfaces/ianjuta-buildable.c
    #	libanjuta/interfaces/ianjuta-buildable.h
    #	libanjuta/interfaces/ianjuta-builder.c
    #	libanjuta/interfaces/ianjuta-builder.h
    #	libanjuta/interfaces/ianjuta-debug-manager.c
    #	libanjuta/interfaces/ianjuta-debug-manager.h
    #	libanjuta/interfaces/ianjuta-debugger-breakpoint.c
    #	libanjuta/interfaces/ianjuta-debugger-breakpoint.h
    #	libanjuta/interfaces/ianjuta-debugger-instruction.c
    #	libanjuta/interfaces/ianjuta-debugger-instruction.h
    #	libanjuta/interfaces/ianjuta-debugger-memory.c
    #	libanjuta/interfaces/ianjuta-debugger-memory.h
    #	libanjuta/interfaces/ianjuta-debugger-register.c
    #	libanjuta/interfaces/ianjuta-debugger-register.h
    #	libanjuta/interfaces/ianjuta-debugger-variable.c
    #	libanjuta/interfaces/ianjuta-debugger-variable.h
    #	libanjuta/interfaces/ianjuta-debugger.c
    #	libanjuta/interfaces/ianjuta-debugger.h
    #	libanjuta/interfaces/ianjuta-document-manager.c
    #	libanjuta/interfaces/ianjuta-document-manager.h
    #	libanjuta/interfaces/ianjuta-document.c
    #	libanjuta/interfaces/ianjuta-document.h
    #	libanjuta/interfaces/ianjuta-editor-assist.c
    #	libanjuta/interfaces/ianjuta-editor-assist.h
    #	libanjuta/interfaces/ianjuta-editor-cell-style.c
    #	libanjuta/interfaces/ianjuta-editor-cell-style.h
    #	libanjuta/interfaces/ianjuta-editor-cell.c
    #	libanjuta/interfaces/ianjuta-editor-cell.h
    #	libanjuta/interfaces/ianjuta-editor-comment.c
    #	libanjuta/interfaces/ianjuta-editor-comment.h
    #	libanjuta/interfaces/ianjuta-editor-convert.c
    #	libanjuta/interfaces/ianjuta-editor-convert.h
    #	libanjuta/interfaces/ianjuta-editor-factory.c
    #	libanjuta/interfaces/ianjuta-editor-factory.h
    #	libanjuta/interfaces/ianjuta-editor-folds.c
    #	libanjuta/interfaces/ianjuta-editor-folds.h
    #	libanjuta/interfaces/ianjuta-editor-goto.c
    #	libanjuta/interfaces/ianjuta-editor-goto.h
    #	libanjuta/interfaces/ianjuta-editor-hover.c
    #	libanjuta/interfaces/ianjuta-editor-hover.h
    #	libanjuta/interfaces/ianjuta-editor-language.c
    #	libanjuta/interfaces/ianjuta-editor-language.h
    #	libanjuta/interfaces/ianjuta-editor-line-mode.c
    #	libanjuta/interfaces/ianjuta-editor-line-mode.h
    #	libanjuta/interfaces/ianjuta-editor-search.c
    #	libanjuta/interfaces/ianjuta-editor-search.h
    #	libanjuta/interfaces/ianjuta-editor-selection.c
    #	libanjuta/interfaces/ianjuta-editor-selection.h
    #	libanjuta/interfaces/ianjuta-editor-tip.c
    #	libanjuta/interfaces/ianjuta-editor-tip.h
    #	libanjuta/interfaces/ianjuta-editor-view.c
    #	libanjuta/interfaces/ianjuta-editor-view.h
    #	libanjuta/interfaces/ianjuta-editor-zoom.c
    #	libanjuta/interfaces/ianjuta-editor-zoom.h
    #	libanjuta/interfaces/ianjuta-editor.c
    #	libanjuta/interfaces/ianjuta-editor.h
    #	libanjuta/interfaces/ianjuta-environment.c
    #	libanjuta/interfaces/ianjuta-environment.h
    #	libanjuta/interfaces/ianjuta-file-loader.c
    #	libanjuta/interfaces/ianjuta-file-loader.h
    #	libanjuta/interfaces/ianjuta-file-manager.c
    #	libanjuta/interfaces/ianjuta-file-manager.h
    #	libanjuta/interfaces/ianjuta-file-savable.c
    #	libanjuta/interfaces/ianjuta-file-savable.h
    #	libanjuta/interfaces/ianjuta-file.c
    #	libanjuta/interfaces/ianjuta-file.h
    #	libanjuta/interfaces/ianjuta-help.c
    #	libanjuta/interfaces/ianjuta-help.h
    #	libanjuta/interfaces/ianjuta-indicable.c
    #	libanjuta/interfaces/ianjuta-indicable.h
    #	libanjuta/interfaces/ianjuta-iterable-tree.c
    #	libanjuta/interfaces/ianjuta-iterable-tree.h
    #	libanjuta/interfaces/ianjuta-iterable.c
    #	libanjuta/interfaces/ianjuta-iterable.h
    #	libanjuta/interfaces/ianjuta-language.c
    #	libanjuta/interfaces/ianjuta-language.h
    #	libanjuta/interfaces/ianjuta-loader.c
    #	libanjuta/interfaces/ianjuta-loader.h
    #	libanjuta/interfaces/ianjuta-markable.c
    #	libanjuta/interfaces/ianjuta-markable.h
    #	libanjuta/interfaces/ianjuta-message-manager.c
    #	libanjuta/interfaces/ianjuta-message-manager.h
    #	libanjuta/interfaces/ianjuta-message-view.c
    #	libanjuta/interfaces/ianjuta-message-view.h
    #	libanjuta/interfaces/ianjuta-plugin-factory.c
    #	libanjuta/interfaces/ianjuta-plugin-factory.h
    #	libanjuta/interfaces/ianjuta-preferences.c
    #	libanjuta/interfaces/ianjuta-preferences.h
    #	libanjuta/interfaces/ianjuta-print.c
    #	libanjuta/interfaces/ianjuta-print.h
    #	libanjuta/interfaces/ianjuta-project-backend.c
    #	libanjuta/interfaces/ianjuta-project-backend.h
    #	libanjuta/interfaces/ianjuta-project-manager.c
    #	libanjuta/interfaces/ianjuta-project-manager.h
    #	libanjuta/interfaces/ianjuta-project.c
    #	libanjuta/interfaces/ianjuta-project.h
    #	libanjuta/interfaces/ianjuta-provider.c
    #	libanjuta/interfaces/ianjuta-provider.h
    #	libanjuta/interfaces/ianjuta-snippets-manager.c
    #	libanjuta/interfaces/ianjuta-snippets-manager.h
    #	libanjuta/interfaces/ianjuta-stream-loader.c
    #	libanjuta/interfaces/ianjuta-stream-loader.h
    #	libanjuta/interfaces/ianjuta-stream-savable.c
    #	libanjuta/interfaces/ianjuta-stream-savable.h
    #	libanjuta/interfaces/ianjuta-stream.c
    #	libanjuta/interfaces/ianjuta-stream.h
    #	libanjuta/interfaces/ianjuta-symbol-manager.c
    #	libanjuta/interfaces/ianjuta-symbol-manager.h
    #	libanjuta/interfaces/ianjuta-symbol-query.c
    #	libanjuta/interfaces/ianjuta-symbol-query.h
    #	libanjuta/interfaces/ianjuta-symbol.c
    #	libanjuta/interfaces/ianjuta-symbol.h
    #	libanjuta/interfaces/ianjuta-terminal.c
    #	libanjuta/interfaces/ianjuta-terminal.h
    #	libanjuta/interfaces/ianjuta-todo.c
    #	libanjuta/interfaces/ianjuta-todo.h
    #	libanjuta/interfaces/ianjuta-vcs.c
    #	libanjuta/interfaces/ianjuta-vcs.h
    #	libanjuta/interfaces/ianjuta-wizard.c
    #	libanjuta/interfaces/ianjuta-wizard.h
    #	libanjuta/interfaces/iface-built.stamp
    #	libanjuta/interfaces/libanjuta-iface-marshallers.c
    #	libanjuta/interfaces/libanjuta-iface-marshallers.h
    #	libanjuta/interfaces/libanjuta-iface-marshallers.list
    #	libanjuta/interfaces/libanjuta-interfaces.h
    #	libfoocanvas/Makefile.in
    #	ltmain.sh
    #	m4/gnome-doc-utils.m4
    #	m4/intltool.m4
    #	manuals/reference/libanjuta/libanjuta-sections.txt
    #	manuals/reference/libanjuta/libanjuta.types
    #	manuals/reference/libanjuta/tmpl/
    #	missing
    #	mkinstalldirs
    #	module.patch
    #	omf.make
    #	pixmaps/16x16/Makefile.in
    #	pixmaps/22x22/Makefile.in
    #	pixmaps/24x24/Makefile.in
    #	pixmaps/32x32/Makefile.in
    #	pixmaps/48x48/Makefile.in
    #	pixmaps/scalable/Makefile.in
    #	plugins/am-project/tests/Makefile.am~
    #	plugins/am-project/tests/Makefile.in
    #	plugins/am-project/tests/group.at~
    #	plugins/am-project/tests/package.at~
    #	plugins/am-project/tests/package.m4
    #	plugins/am-project/tests/testsuite
    #	plugins/class-inheritance/Makefile.in
    #	plugins/glade/Makefile.in
    #	plugins/gtodo/Makefile.in
    #	plugins/js-debugger/Makefile.in
    #	plugins/language-support-cpp-java/cxxparser/Makefile.in
    #	plugins/language-support-js/Makefile.in
    #	plugins/language-support-python/Makefile.in
    #	plugins/mk-project/Makefile.am~
    #	plugins/mk-project/Makefile.in
    #	plugins/project-wizard/templates/js_minimal/Makefile.in
    #	plugins/project-wizard/templates/js_minimal/src/Makefile.in
    #	plugins/symbol-db/anjuta-tags/Makefile.in
    #	plugins/symbol-db/benchmark/Makefile.in
    #	po/Makefile.in.in~
    #	po/Makevars.template
    #	po/Rules-quot
    #	po/boldquot.sed
    #	po/en@boldquot.header
    #	po/en@quot.header
    #	po/insert-header.sin
    #	po/quot.sed
    #	po/remove-potcdate.sin
    #	xmldocs.make
    #	ylwrap
    5fb31c3a
Name
Last commit
Last update
data Loading commit data...
doc Loading commit data...
launcher Loading commit data...
libanjuta Loading commit data...
libfoocanvas Loading commit data...
m4 Loading commit data...
manuals Loading commit data...
mime Loading commit data...
omf-install Loading commit data...
pixmaps Loading commit data...
plugins Loading commit data...
po Loading commit data...
scripts Loading commit data...
src Loading commit data...
.gitignore Loading commit data...
AUTHORS Loading commit data...
COPYING Loading commit data...
ChangeLog Loading commit data...
FUTURE Loading commit data...
HACKING Loading commit data...
MAINTAINERS Loading commit data...
Makefile.am Loading commit data...
NEWS Loading commit data...
README Loading commit data...
ROADMAP Loading commit data...
SEARCH-REPLACE Loading commit data...
THANKS Loading commit data...
TODO Loading commit data...
TODO.tasks Loading commit data...
acinclude.m4 Loading commit data...
anjuta.anjuta Loading commit data...
anjuta.desktop.in.in Loading commit data...
anjuta.doap Loading commit data...
anjuta.jhbuildrc Loading commit data...
anjuta.prj Loading commit data...
autogen.sh Loading commit data...
configure.ac Loading commit data...
git.mk Loading commit data...
setup-gettext Loading commit data...