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

[James Liggett <jrliggett src gnome org>]

commit c8e44473b132921197cdd4f862863a5e3774155e
Merge: cfaabb6 19ddad8
Author: James Liggett <jrliggett cox net>
Date:   Tue Jun 1 14:46:37 2010 -0700

    Merge branch 'master' into git-shell

 configure.in                                       |    4 +-
 libanjuta/anjuta-launcher.c                        |   14 +
 plugins/message-view/plugin.c                      |    2 +-
 plugins/project-wizard/druid.c                     |   18 +-
 plugins/project-wizard/header.c                    |   34 ++-
 plugins/project-wizard/header.h                    |    4 +-
 plugins/project-wizard/parser.c                    |  444 +++++++++++---------
 plugins/project-wizard/property.c                  |  117 +++++-
 plugins/project-wizard/property.h                  |    7 +-
 plugins/project-wizard/templates/Makefile.am       |   47 +-
 plugins/project-wizard/templates/anjuta-plugin.wiz |  123 ------
 .../project-wizard/templates/anjuta-plugin.wiz.in  |  125 ++++++
 plugins/project-wizard/templates/cpp.wiz           |   94 ----
 plugins/project-wizard/templates/cpp.wiz.in        |   96 +++++
 plugins/project-wizard/templates/django.wiz        |   27 --
 plugins/project-wizard/templates/django.wiz.in     |   29 ++
 .../templates/extract-translatable-strings.pl      |   40 --
 plugins/project-wizard/templates/gcj.wiz           |  100 -----
 plugins/project-wizard/templates/gcj.wiz.in        |  102 +++++
 plugins/project-wizard/templates/gnome-applet.wiz  |  102 -----
 .../project-wizard/templates/gnome-applet.wiz.in   |  104 +++++
 plugins/project-wizard/templates/gtk.wiz           |   96 -----
 plugins/project-wizard/templates/gtk.wiz.in        |   98 +++++
 plugins/project-wizard/templates/gtkmm.wiz         |   95 -----
 plugins/project-wizard/templates/gtkmm.wiz.in      |   97 +++++
 plugins/project-wizard/templates/java.wiz          |   89 ----
 plugins/project-wizard/templates/java.wiz.in       |   91 ++++
 plugins/project-wizard/templates/js.wiz            |   56 ---
 plugins/project-wizard/templates/js.wiz.in         |   58 +++
 plugins/project-wizard/templates/library.wiz       |  100 -----
 plugins/project-wizard/templates/library.wiz.in    |  102 +++++
 plugins/project-wizard/templates/minimal.wiz       |   73 ----
 plugins/project-wizard/templates/minimal.wiz.in    |   76 ++++
 plugins/project-wizard/templates/mkfile.wiz        |   24 -
 plugins/project-wizard/templates/mkfile.wiz.in     |   26 ++
 plugins/project-wizard/templates/python.wiz        |   89 ----
 plugins/project-wizard/templates/python.wiz.in     |   91 ++++
 plugins/project-wizard/templates/sdl.wiz           |   85 ----
 plugins/project-wizard/templates/sdl.wiz.in        |   87 ++++
 plugins/project-wizard/templates/terminal.wiz      |   85 ----
 plugins/project-wizard/templates/terminal.wiz.in   |   87 ++++
 .../templates/translatable-strings.h               |  115 -----
 plugins/project-wizard/templates/wxwin.wiz         |   88 ----
 plugins/project-wizard/templates/wxwin.wiz.in      |   90 ++++
 plugins/project-wizard/templates/xlib-dock.wiz     |   96 -----
 plugins/project-wizard/templates/xlib-dock.wiz.in  |   98 +++++
 plugins/project-wizard/templates/xlib.wiz          |   91 ----
 plugins/project-wizard/templates/xlib.wiz.in       |   93 ++++
 po/POTFILES.in                                     |   19 +-
 49 files changed, 1991 insertions(+), 1937 deletions(-)
---