[rocksndiamonds] 04/08: Merge tag 'upstream/4.0.0.2+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 11c2e6cb94486de0247c6f5933df6bd5d477d7dd
Merge: f735930 09c4fb1
Author: Stephen Kitt <skitt at debian.org>
Date:   Sat May 6 18:31:59 2017 +0200

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

 Makefile              |   7 -
 src/Makefile          |   9 +-
 src/conftime.h        |   2 +-
 src/editor.c          | 777 ++++++++++++++++++++++++++++++++------------------
 src/files.c           | 200 ++++++++-----
 src/files.h           |   2 +
 src/game.c            |  86 +++---
 src/init.c            |  26 +-
 src/libgame/gadgets.c |   2 +-
 src/libgame/misc.c    |  26 +-
 src/libgame/misc.h    |   1 +
 src/libgame/sdl.c     |  35 ++-
 src/libgame/system.c  |   8 +
 src/libgame/system.h  |   8 +
 src/main.h            |   5 +-
 src/screens.c         |  67 ++++-
 src/tape.c            |  91 +++++-
 src/tape.h            |   2 +
 src/tools.c           |  10 +
 19 files changed, 915 insertions(+), 449 deletions(-)

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