[anjuta/git-shell: 26/26] Merge branch 'master' into git-shell

[James Liggett <jrliggett src gnome org>]

commit 4e53f9c5092ab5b02b581dda6e12415125760355
Merge: 32be608 6850547
Author: James Liggett <jrliggett cox net>
Date:   Mon May 17 18:50:48 2010 -0700

    Merge branch 'master' into git-shell

 .gitignore                                         |   66 +-
 configure.in                                       |    6 +-
 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/debug-manager/start.c                      |   12 +-
 plugins/document-manager/plugin.c                  |   12 +-
 plugins/document-manager/plugin.h                  |    2 +-
 plugins/file-manager/plugin.c                      |   30 +-
 plugins/file-manager/plugin.h                      |    3 +-
 plugins/glade/Makefile.am                          |    2 +-
 plugins/glade/anjuta-design-document.c             |    2 +-
 plugins/glade/anjuta-glade.glade                   |  467 ---
 .../glade/{anjuta-glade.ui => anjuta-glade.xml}    |    0
 plugins/glade/plugin.c                             |  377 +-
 .../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                                      | 4384 +++++++++++++++-----
 29 files changed, 3959 insertions(+), 2709 deletions(-)
---