[lgeneral] 03/05: Merge tag 'upstream/1.3.0'

[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 5c2b79512dcf8c0155e1d17387910ac1b1983df5
Merge: c5628a5 be0daec
Author: Markus Koschany <apo at gambaru.de>
Date:   Wed Aug 12 10:47:53 2015 +0200

    Merge tag 'upstream/1.3.0'
    
    Upstream version 1.3.0
    
    # gpg: Signature made Wed 12 Aug 2015 10:47:49 CEST 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          |   6 ++
 TODO               |  10 +--
 configure          |   4 +-
 configure.in       |   4 +-
 lgc-pg/lgc-pg.1    |   5 +-
 lgc-pg/main.c      |   5 +-
 src/ai.c           |   9 +-
 src/campaign.c     |   5 ++
 src/campaign.h     |  19 +++--
 src/campaigns/PG   |  23 ++++++
 src/date.c         |   6 +-
 src/engine.c       |  25 +++++-
 src/file.c         |   6 +-
 src/gui.c          |  71 +++++++++++-----
 src/player.h       |   1 +
 src/purchase_dlg.c | 112 +++++++++++++++++++------
 src/purchase_dlg.h |   3 +-
 src/scenario.c     | 237 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 src/scenario.h     |   8 ++
 src/slot.c         | 100 +++++++++++++++++++++-
 src/unit.c         |  26 ++++++
 src/unit.h         |  23 ++++++
 22 files changed, 607 insertions(+), 101 deletions(-)

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