[lgeneral] branch upstream updated (5163812 -> df4bfe8)

[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  5163812   Imported Upstream version 1.2.5+dfsg
       new  df4bfe8   Imported Upstream version 1.2.6

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:
 AUTHORS                        |  14 ++-
 ChangeLog                      |  12 +++
 Makefile.am                    |  13 +--
 Makefile.in                    |  13 +--
 TODO                           |  22 +----
 configure                      |   2 +-
 configure.in                   |   2 +-
 lgc-pg/convdata/Makefile.am    |   2 +-
 lgc-pg/convdata/Makefile.in    |   2 +-
 lgc-pg/maps.c                  |  18 ++--
 lgc-pg/misc.c                  |   4 +-
 lgc-pg/misc.h                  |   5 ++
 lgc-pg/parser.c                |   4 +-
 lgc-pg/scenarios.c             |  78 ++++++++--------
 lgc-pg/shp.c                   |  46 +++++-----
 lgc-pg/units.c                 |  58 ++++++------
 lgeneral-redit/src/parser.c    |   9 +-
 lgeneral.desktop               |   9 ++
 lgeneral.desktop.in            |   7 --
 lgeneral48.png => lgeneral.png | Bin
 lgeneral16.png                 | Bin 437 -> 0 bytes
 lgeneral32.png                 | Bin 1170 -> 0 bytes
 src/action.h                   |   4 +-
 src/engine.c                   | 200 ++++++++++++++++++++++++-----------------
 src/main.c                     |  12 ++-
 src/map.c                      |  32 ++-----
 src/misc.h                     |   5 ++
 src/parser.c                   |   4 +-
 src/scenario.c                 |   3 +-
 src/slot.c                     |  38 +++++---
 30 files changed, 324 insertions(+), 294 deletions(-)
 create mode 100644 lgeneral.desktop
 delete mode 100644 lgeneral.desktop.in
 rename lgeneral48.png => lgeneral.png (100%)
 delete mode 100644 lgeneral16.png
 delete mode 100644 lgeneral32.png

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