[freedoom] 02/02: Merge tag 'upstream/0.11.2'

[Fabian Greffrath]

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

fabian pushed a commit to branch master
in repository freedoom.

commit bed7332d2ce082b295900e23cb26cd04e97fb67f
Merge: fbf153c fc5d302
Author: Fabian Greffrath <fabian at debian.org>
Date:   Wed Jun 7 21:29:53 2017 +0200

    Merge tag 'upstream/0.11.2'
    
    Upstream version 0.11.2

 CREDITS                                            |  17 ++++++-
 Makefile                                           |   4 +-
 README.adoc                                        |  50 +++++++--------------
 VERSION                                            |   2 +-
 buildcfg.txt                                       |  31 +++++++------
 dist/Makefile                                      |   2 +-
 graphics/.gitignore                                |   3 +-
 graphics/text/.gitignore                           |   1 +
 graphics/text/Makefile                             |  29 ++++++------
 graphics/text/config.py                            |   4 ++
 graphics/text/textgen                              |  19 +++++---
 graphics/titlepic/Makefile                         |  23 ++++++----
 graphics/titlepic/create_caption                   |  22 +++++----
 graphics/{captainw => titlepic}/freedm_title.png   | Bin
 graphics/{captainw => titlepic}/freedm_title2.png  | Bin
 .../fdmtitle.gif => titlepic/freedm_titlepic.gif}  | Bin
 levels/c2m6.wad                                    | Bin 146192 -> 146222 bytes
 levels/c3m1.wad                                    | Bin 90793 -> 90793 bytes
 levels/c3m4.wad                                    | Bin 263686 -> 263716 bytes
 levels/c4m2.wad                                    | Bin 554773 -> 555047 bytes
 levels/dm11.wad                                    | Bin 40686 -> 40686 bytes
 levels/dm17.wad                                    | Bin 77208 -> 77238 bytes
 levels/dm31.wad                                    | Bin 16312 -> 16342 bytes
 levels/map02.wad                                   | Bin 140233 -> 140233 bytes
 levels/map09.wad                                   | Bin 205586 -> 205586 bytes
 levels/map12.wad                                   | Bin 1550368 -> 1550368 bytes
 levels/map17.wad                                   | Bin 125141 -> 125543 bytes
 lumps/dehacked.lmp                                 |  35 +++++++++++++--
 lumps/fdm_deh.lmp                                  |   2 +-
 scripts/makepkgs                                   |  10 ++---
 sprites/arm1a0.gif                                 | Bin 1197 -> 1164 bytes
 sprites/arm1b0.gif                                 | Bin 1202 -> 1181 bytes
 32 files changed, 149 insertions(+), 105 deletions(-)

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