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

[James Liggett <jrliggett src gnome org>]

commit 985b23ea8f6fd01328d2ae492e944cae803e9496
Merge: 1a3be0b f3fbd4b
Author: James Liggett <jrliggett cox net>
Date:   Mon Jun 14 16:51:59 2010 -0700

    Merge branch 'master' into git-shell

 libanjuta/anjuta-utils.c                           |   20 +-
 libanjuta/anjuta-utils.h                           |    1 +
 .../reference/libanjuta/project-wizard-format.sgml |   42 +
 mime/anjuta.xml                                    |    5 +
 plugins/project-wizard/Makefile.am                 |    4 +-
 .../project-wizard/anjuta-project-wizard.plugin.in |    5 +-
 plugins/project-wizard/druid.c                     |   46 +-
 plugins/project-wizard/druid.h                     |    2 +-
 plugins/project-wizard/plugin.c                    |  153 ++-
 plugins/project-wizard/plugin.h                    |    2 +
 plugins/project-wizard/tar.c                       |  231 ++++
 plugins/project-wizard/tar.h                       |   34 +
 po/gl.po                                           | 1312 +++++++++++++-------
 po/id.po                                           |  974 ++++++---------
 src/anjuta.c                                       |   24 +-
 15 files changed, 1774 insertions(+), 1081 deletions(-)
---