[lgeneral] branch upstream updated (11d08d4 -> 5163812)

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a change to branch upstream
in repository lgeneral.

      from  11d08d4   Imported Upstream version 1.2.4+dfsg
       new  5163812   Imported Upstream version 1.2.5+dfsg

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ChangeLog                            |   8 ++
 TODO                                 |   5 +
 configure                            |   2 +-
 configure.in                         |   2 +-
 lgc-pg/Makefile.in                   |   4 +-
 lgc-pg/convdata/Makefile.in          |   4 +-
 lgc-pg/scenarios.c                   |  24 ++--
 lgc-pg/units.c                       |   2 +-
 lged/Makefile.in                     |   4 +-
 po/Makefile.in                       |   4 +-
 src/Makefile.in                      |   4 +-
 src/action.c                         |   6 +
 src/action.h                         |   2 +
 src/ai_modules/Makefile.in           |   4 +-
 src/campaigns/Makefile.in            |   4 +-
 src/engine.c                         | 201 ++++++++++++++++++++++++++--
 src/gfx/Makefile.in                  |   4 +-
 src/gfx/flags/Makefile.in            |   4 +-
 src/gfx/terrain/Makefile.in          |   4 +-
 src/gfx/units/Makefile.in            |   4 +-
 src/gui.c                            | 247 ++++++++++++++++++++++++++++++++++-
 src/gui.h                            |  19 +++
 src/main.c                           |   2 +-
 src/map.c                            |   7 +-
 src/map.h                            |   1 +
 src/maps/Makefile.in                 |   4 +-
 src/music/Makefile.in                |   4 +-
 src/nations/Makefile.in              |   4 +-
 src/scenario.c                       |  11 +-
 src/scenarios/Makefile.in            |   4 +-
 src/slot.c                           |  18 ++-
 src/sounds/Makefile.in               |   4 +-
 src/terrain/Makefile.in              |   4 +-
 src/themes/Makefile.in               |   4 +-
 src/themes/default/Makefile.in       |   4 +-
 src/themes/default/menu0_buttons.bmp | Bin 55350 -> 83082 bytes
 src/unit.c                           |  38 +++++-
 src/unit.h                           |   3 +-
 src/unit_lib.c                       |   1 +
 src/unit_lib.h                       |   1 +
 src/units/Makefile.in                |   4 +-
 tools/Makefile.in                    |   4 +-
 tools/ltrextract/Makefile.in         |   4 +-
 util/Makefile.in                     |   4 +-
 44 files changed, 605 insertions(+), 87 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lgeneral.git