[tworld] 02/05: Merge tag 'upstream/1.3.2'

[Gerfried Fuchs]

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

rhonda pushed a commit to branch master
in repository tworld.

commit 1aaf18a0ebe53bffc20ef4acce664dd11ac24a09
Merge: e49dd70 6809c65
Author: Rhonda D'Vine <rhonda at debian.org>
Date:   Tue Dec 29 00:57:08 2015 +0100

    Merge tag 'upstream/1.3.2'
    
    Imported Upstream version 1.3.2

 BUGS               |   31 +-
 Changelog          |   44 +
 Makefile.in        |   41 +-
 README             |   97 +-
 cmdline.c          |  283 +++--
 cmdline.h          |  145 +--
 configure          | 3077 +++++++++++++++++++++++++++++++++++++++++++---------
 configure.in       |   14 +-
 defs.h             |   31 +-
 docs/tworld.6      |  107 +-
 docs/tworld.html   |  163 +--
 fileio.c           |   12 +-
 fileio.h           |    7 -
 help.c             |  101 +-
 logic.h            |    7 +-
 lxlogic.c          |  401 +++----
 messages.c         |  133 +++
 messages.h         |   44 +
 mklynxcc.c         |  104 --
 mslogic.c          |  187 ++--
 oshw-sdl/sdlgen.h  |   15 +-
 oshw-sdl/sdlin.c   |   17 +-
 oshw-sdl/sdloshw.c |   59 +-
 oshw-sdl/sdlout.c  |  125 ++-
 oshw-sdl/sdlsfx.c  |   16 +-
 oshw-sdl/sdltext.c |   54 +-
 oshw.h             |   50 +-
 play.c             |   53 +-
 play.h             |   30 +-
 res.c              |  153 ++-
 res.h              |    5 +-
 res/font.bmp       |  Bin 19702 -> 19702 bytes
 res/unslist.txt    |   33 +-
 series.c           |   42 +-
 series.h           |   10 +-
 sets/CCLP2.dac     |    2 -
 solution.c         |   80 +-
 solution.h         |   15 +-
 state.h            |    3 +-
 tworld.c           |  546 ++++++----
 unslist.c          |    4 +-
 ver.h              |    2 +-
 42 files changed, 4520 insertions(+), 1823 deletions(-)

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