[rott] 03/05: Merge tag 'upstream/1.1.2+svn287'

[Fabian Greffrath]

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

fabian-guest pushed a commit to branch master
in repository rott.

commit 8a13248dabca4f4535cad0c5bb68d98e0b1d69c1
Merge: 3cf851d aede78d
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Thu Apr 30 16:25:57 2015 +0200

    Merge tag 'upstream/1.1.2+svn287'
    
    Upstream version 1.1.2+svn287

 Makefile.am                              |   1 +
 Makefile_old                             |  33 ++++
 README                                   |  35 ++--
 configure.ac                             |  85 ++++++++++
 misc/icons.mk                            |   5 +
 misc/rott.png                            | Bin 0 -> 1820 bytes
 misc/rott.svg                            | 282 +++++++++++++++++++++++++++++++
 misc/rott.xpm                            | 219 ++++++++++++++++--------
 misc/runrott.sh                          |   2 +-
 rott/Makefile.am                         |  56 ++++++
 rott/{Makefile => Makefile_old}          |  10 +-
 rott/_rt_floo.h                          |   2 +-
 rott/_rt_ted.h                           |  13 --
 rott/audiolib/Makefile.am                |  13 ++
 rott/audiolib/{Makefile => Makefile_old} |   0
 rott/develop.h                           |   8 +-
 rott/modexlib.c                          |  13 +-
 rott/rt_actor.c                          |  15 +-
 rott/rt_cfg.c                            |  13 +-
 rott/rt_cfg.h                            |   4 +-
 rott/rt_draw.c                           |  19 ++-
 rott/rt_floor.c                          |   9 +-
 rott/rt_game.c                           |   4 +-
 rott/rt_main.c                           |  53 ++++--
 rott/rt_main.h                           |  10 ++
 rott/rt_menu.c                           |  13 +-
 rott/rt_scale.c                          |   4 +-
 rott/rt_ted.c                            |   5 +-
 rott/rt_util.c                           |   2 +-
 rott/rt_view.c                           |  11 +-
 30 files changed, 765 insertions(+), 174 deletions(-)

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