[anjuta/sdb-queries: 14/22] Merge branch 'master' into sdb-queries

[Naba Kumar <naba src gnome org>]

commit 3fa998a858efb062890637727cfc7c64730925f2
Merge: df23f58 30d4a4e
Author: Naba Kumar <naba gnome org>
Date:   Sun May 16 23:17:56 2010 +0300

    Merge branch 'master' into sdb-queries

 .gitignore                                         |   66 +-
 libfoocanvas/foo-canvas-line.c                     |  243 +-
 libfoocanvas/foo-canvas-line.h                     |    9 +-
 libfoocanvas/foo-canvas-polygon.c                  |  174 +-
 libfoocanvas/foo-canvas-polygon.h                  |    6 +-
 libfoocanvas/foo-canvas-rect-ellipse.c             |  441 +--
 libfoocanvas/foo-canvas-rect-ellipse.h             |    4 +-
 libfoocanvas/foo-canvas-text.c                     |    4 -
 libfoocanvas/foo-canvas.c                          |   42 +-
 libfoocanvas/foo-canvas.h                          |   10 -
 plugins/class-inheritance/class-callbacks.c        |   10 +-
 plugins/class-inheritance/class-inherit.c          |   13 +-
 plugins/glade/anjuta-design-document.c             |    2 +-
 plugins/glade/plugin.c                             |  366 +-
 .../language-support-cpp-java/cpp-java-assist.c    |  266 +-
 plugins/sourceview/sourceview.c                    |    4 +-
 plugins/symbol-db/symbol-db-engine-core.c          |   70 +-
 plugins/symbol-db/symbol-db-search-command.c       |    7 -
 plugins/symbol-db/tables.sql                       |    2 +
 po/en shaw po                                      | 4444 +++++++++++++++-----
 20 files changed, 3978 insertions(+), 2205 deletions(-)
---