[rocksndiamonds] 03/04: Merge tag 'upstream/4.0.1.1+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 0bc2de7e45a0ca571f59c5ae2f0a3e638851e71f
Merge: cabc4e0 0573579
Author: Stephen Kitt <skitt at debian.org>
Date:   Sat Feb 10 22:46:13 2018 +0100

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

 src/anim.c           |  43 +++++++---
 src/config.c         |  26 ++++--
 src/config.h         |   1 +
 src/conftime.h       |   2 +-
 src/editor.c         |   2 +
 src/events.c         |  47 ++++++-----
 src/files.c          | 178 +++++++++++++++++++++++++++++----------
 src/files.h          |   2 +
 src/game.c           |  51 ++++++++++--
 src/game_sp/export.h |   4 +
 src/game_sp/file.c   |  10 ++-
 src/init.c           |   9 +-
 src/libgame/misc.c   |   6 ++
 src/libgame/sdl.c    |   2 +-
 src/libgame/sdl.h    |   8 +-
 src/libgame/sound.c  |  79 +++++++++++++-----
 src/libgame/sound.h  |   1 +
 src/libgame/system.c |  35 ++++++--
 src/libgame/system.h |  11 ++-
 src/main.c           |  29 +++++--
 src/main.h           |   4 +-
 src/screens.c        | 230 ++++++++++-----------------------------------------
 src/tape.c           |  82 +++++++++++-------
 src/tape.h           |   1 +
 src/tools.c          |  63 ++++++++++----
 25 files changed, 560 insertions(+), 366 deletions(-)

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