Public Git Hosting - anjuta.git/commit

commit	57349badeee18b69e992d630ecfb5ae5932776ad
author	Johannes Schmid <jhs@gnome.org>
	Fri, 19 Nov 2010 16:35:48 +0000 (19 17:35 +0100)
committer	Johannes Schmid <jhs@gnome.org>
	Fri, 19 Nov 2010 17:12:55 +0000 (19 18:12 +0100)
tree	7f218bbcb063ab2ba6e1e5d047dd7be981b5c932	tree \| snapshot (tar.gz zip)
parent	6f001af84f04138a29f6ae971555bd22c9729e75	commit \| diff
parent	6583b129db45c180c6ebfb044a5f9ba60a4ba406	commit \| diff

Merge branch 'sdb-core-trans'

Conflicts:
libanjuta/anjuta-utils.c
plugins/language-support-cpp-java/plugin.c
plugins/symbol-db/anjuta-symbol-db.ui
plugins/symbol-db/plugin.c
plugins/symbol-db/symbol-db-prefs.c
plugins/symbol-db/symbol-db-prefs.h

anjuta mirror

RSS Atom

libanjuta/anjuta-utils.c	diff1 \|	diff2 \|	blob \| history
libanjuta/anjuta-utils.h	diff1 \|	diff2 \|	blob \| history
libanjuta/interfaces/libanjuta.idl	diff1 \|	diff2 \|	blob \| history
plugins/language-support-cpp-java/anjuta-language-cpp-java.ui	diff1 \|	diff2 \|	blob \| history
plugins/language-support-cpp-java/plugin.c	diff1 \|	diff2 \|	blob \| history
plugins/symbol-db/Makefile.am	diff1 \|	diff2 \|	blob \| history
plugins/symbol-db/anjuta-symbol-db.ui	diff1 \|	diff2 \|	blob \| history
plugins/symbol-db/plugin.c	diff1 \|	diff2 \|	blob \| history
plugins/symbol-db/plugin.h	diff1 \|	diff2 \|	blob \| history
plugins/symbol-db/symbol-db-engine-core.c	diff1 \|	diff2 \|	blob \| history