[rocksndiamonds] 02/03: Merge tag 'upstream/4.0.1.3+dfsg'

[Stephen Kitt]

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

skitt pushed a commit to branch master
in repository rocksndiamonds.

commit b3572b19e6aaeb41171d1913b1fe2df44673c0db
Merge: c3b0ccf c54d805
Author: Stephen Kitt <skitt at debian.org>
Date:   Sat Mar 3 20:37:13 2018 +0100

    Merge tag 'upstream/4.0.1.3+dfsg'
    
    Upstream version 4.0.1.3+dfsg

 src/conftime.h          |  2 +-
 src/files.c             | 28 ++++++++++++++++++++++++----
 src/game.c              |  7 +++++++
 src/game_em/convert.c   |  8 ++++++--
 src/game_em/export.h    |  1 +
 src/game_em/graphics.c  |  4 ++++
 src/game_em/input.c     |  4 ++++
 src/game_em/synchro_3.c |  2 +-
 src/game_sp/main.c      |  4 ++++
 src/init.c              | 13 +++++++------
 src/libgame/system.c    | 11 +++++++++++
 src/libgame/system.h    |  1 +
 src/libgame/text.c      | 33 +++++++++++++++++++++------------
 src/main.h              |  4 ++--
 src/tape.c              | 10 +++++++++-
 src/tools.c             |  7 -------
 src/tools.h             |  1 -
 17 files changed, 103 insertions(+), 37 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git