[empire] 03/06: Merge tag 'upstream/1.14'

[Markus Koschany]

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

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

commit 5852e00520e3fe4e357d13298f2d2c3d4693ce43
Merge: dc684ea 88c1516
Author: Markus Koschany <apo at debian.org>
Date:   Tue Jan 5 13:13:04 2016 +0100

    Merge tag 'upstream/1.14'
    
    Upstream version 1.14
    
    # gpg: Signature made Tue 05 Jan 2016 13:13:00 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]

 Makefile       |  5 ++++-
 NEWS           | 15 +++++++++-----
 attack.c       |  5 +++--
 compmove.c     | 36 ++++++++++++++++-----------------
 control        | 14 ++++++++-----
 display.c      |  6 +++---
 edit.c         | 20 +++++++++---------
 empire.6       | 12 ++++++-----
 empire.c       |  2 +-
 game.c         | 32 +++++++++++++++++++----------
 map.c          |  4 ++--
 object.c       | 25 +++++++++--------------
 term.c         |  8 +++-----
 usermove.c     | 64 ++++++++++++++++++++++++++++++++--------------------------
 util.c         |  8 +++++---
 vms-empire.xml |  4 +++-
 16 files changed, 144 insertions(+), 116 deletions(-)

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