[anjuta/sdb-core-trans: 68/70] Merge branch 'master' into sdb-core-trans

[Massimo Cora' <mcora src gnome org>]

commit a260df0d7edbb27150a581e8b0e33fdafb02e583
Merge: 8acf273 c3f9978
Author: Massimo Corà <mcora src gnome org>
Date:   Sat Jun 19 11:36:07 2010 +0200

    Merge branch 'master' into sdb-core-trans

 plugins/language-support-cpp-java/plugin.c |   28 ++++++++++++++--------------
 plugins/symbol-db/symbol-db-engine-core.c  |    6 +++---
 plugins/symbol-db/symbol-db-engine-priv.h  |    2 +-
 plugins/symbol-db/symbol-db-engine-utils.c |    2 +-
 plugins/symbol-db/symbol-db-views.c        |    1 +
 5 files changed, 20 insertions(+), 19 deletions(-)
---