Public Git Hosting - anjuta.git/commit

commit	6583b129db45c180c6ebfb044a5f9ba60a4ba406
author	Massimo Corà <mcora@src.gnome.org>
	Wed, 6 Oct 2010 20:45:22 +0000 (6 22:45 +0200)
committer	Massimo Corà <mcora@src.gnome.org>
	Wed, 6 Oct 2010 20:45:22 +0000 (6 22:45 +0200)
tree	f28e19f6ad53d779ea95527206dddb2c1cdfe4da	tree \| snapshot (tar.gz zip)
parent	f5da06d1ff8d370f5b6e3fe59297ed3c3e7125ad	commit \| diff
parent	27d39868e65f3c68932a78a06ceb47d7b8437179	commit \| diff

Merge branch 'master' into sdb-core-trans

Conflicts:
libanjuta/anjuta-utils.h

anjuta mirror

libanjuta/anjuta-utils.c	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/symbol-db/plugin.c	diff1 \|	diff2 \|	blob \| history
plugins/symbol-db/symbol-db-system.c	diff1 \|	diff2 \|	blob \| history