[lgeneral] 05/07: Merge tag 'upstream/1.3.1'

[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 9b54eaf731f6f3cc77781e1a30bf32a8ba30d090
Merge: d48a357 9d802c8
Author: Markus Koschany <apo at debian.org>
Date:   Wed Jan 13 17:24:07 2016 +0100

    Merge tag 'upstream/1.3.1'
    
    Upstream version 1.3.1
    
    # gpg: Signature made Wed 13 Jan 2016 17:24: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]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]

 ChangeLog                   |  6 ++++++
 TODO                        |  1 -
 acconfig.h                  |  3 ++-
 config.h.in                 |  3 ++-
 configure                   |  2 +-
 configure.in                |  2 +-
 intl/localealias.c          |  2 +-
 lgc-pg/main.c               | 16 ++++++++++++++++
 lgc-pg/maps.c               |  6 +++---
 lgc-pg/misc.c               |  8 ++++----
 lgc-pg/nations.c            |  2 +-
 lgc-pg/parser.c             |  2 +-
 lgc-pg/scenarios.c          | 10 +++++-----
 lgc-pg/shp.c                |  2 +-
 lgc-pg/terrain.c            | 21 ++++++++++++---------
 lgc-pg/units.c              |  8 ++++----
 lged/lged.c                 |  4 ++--
 lgeneral-redit/src/misc.c   |  6 +++---
 lgeneral-redit/src/parser.c |  2 +-
 po/lgeneral/POTFILES.in     |  2 +-
 src/Makefile.am             |  4 ++--
 src/Makefile.in             | 10 +++++-----
 src/config.c                |  8 ++------
 src/file.c                  |  4 ++--
 src/image.c                 |  2 +-
 src/{sdl.c => lg-sdl.c}     |  4 ++--
 src/{sdl.h => lg-sdl.h}     |  0
 src/lgeneral.h              |  2 +-
 src/map.c                   |  7 +++++--
 src/misc.c                  |  2 +-
 src/nation.c                |  2 +-
 src/parser.c                |  2 +-
 src/purchase_dlg.c          |  2 +-
 src/scenario.c              |  2 +-
 src/slot.c                  |  9 +++------
 35 files changed, 95 insertions(+), 73 deletions(-)

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