[lgeneral] 04/06: Merge tag 'upstream/1.2.5+dfsg'

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository lgeneral.

commit 31f0bc8d0a8d604357c2f94518a7e7601f8e57ed
Merge: 9df0877 5163812
Author: Markus Koschany <apo at gambaru.de>
Date:   Sat Mar 7 09:35:06 2015 +0100

    Merge tag 'upstream/1.2.5+dfsg'
    
    Upstream version 1.2.5+dfsg
    
    # gpg: Signature made Sat 07 Mar 2015 09:35:03 CET using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]

 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