[rocksndiamonds] 02/09: Merge tag 'upstream/4.0.1.0+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 c65359db87ae0e2c48009942df557330739a76b3
Merge: b1013e5 92f36cc
Author: Stephen Kitt <skitt at debian.org>
Date:   Fri Oct 20 21:55:13 2017 +0200

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

 conf/gamecontrollerdb.txt | 181 +++++++++++++
 src/anim.c                | 330 ++++++++++++++++++++++-
 src/anim.h                |   2 +
 src/conf_gfx.c            |  52 +++-
 src/conf_gfx.h            | 668 +++++++++++++++++++++++++---------------------
 src/conftime.h            |   2 +-
 src/events.c              | 262 ++++++++++++------
 src/events.h              |   2 +
 src/files.c               |  92 ++++++-
 src/files.h               |   2 +
 src/game.c                |  23 +-
 src/game.h                |   2 +
 src/game_em/convert.c     |   3 +
 src/game_em/export.h      |   7 +
 src/game_em/input.c       |  18 +-
 src/game_sp/main.c        |   3 +
 src/init.c                |  56 +++-
 src/libgame/joystick.c    |  62 ++++-
 src/libgame/joystick.h    |  25 +-
 src/libgame/misc.c        | 120 ++++++++-
 src/libgame/sdl.c         | 341 ++++++++++++++++++++---
 src/libgame/sdl.h         |  10 +
 src/libgame/setup.c       |  15 +-
 src/libgame/system.c      |  38 ++-
 src/libgame/system.h      |  30 ++-
 src/main.c                |  79 +++++-
 src/main.h                | 113 +++++---
 src/screens.c             | 490 ++++++++++++++++++++++++++++++----
 src/tape.c                |  21 +-
 src/tools.c               |  64 ++++-
 30 files changed, 2525 insertions(+), 588 deletions(-)

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