[open-adventure] 02/04: Merge tag 'upstream/1.4+git20170917.0.d512384'

[Dr. Tobias Quathamer]

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

toddy pushed a commit to branch master
in repository open-adventure.

commit 24eeb0d168688173112ab9b8389eb36b7087494f
Merge: f0a2906 62a2236
Author: Dr. Tobias Quathamer <toddy at debian.org>
Date:   Sat Sep 30 09:08:05 2017 +0200

    Merge tag 'upstream/1.4+git20170917.0.d512384'
    
    Upstream version 1.4+git20170917.0.d512384

 NEWS                  |   2 +-
 actions.c             |  47 +++++++++---------
 advent.h              |  43 ++++++++++-------
 init.c                |   6 ---
 main.c                |  80 +++++++++++++++---------------
 misc.c                |  32 ++++++------
 saveresume.c          | 131 +++++++++++++++++++++++++++++++++++++++++++++++---
 tests/Makefile        |   1 -
 tests/illformed.chk   |   2 +-
 tests/resumefail2.chk |   2 +-
 10 files changed, 233 insertions(+), 113 deletions(-)

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