[game-data-packager] 03/03: Merge branch 'master' into baldurs-gate

[Markus Koschany]

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

apo-guest pushed a commit to branch baldurs-gate
in repository game-data-packager.

commit dabea5e4f24ada9ef8e736c295bb983c13b0cc95
Merge: befd3e0 b8159e8
Author: Markus Koschany <apo at gambaru.de>
Date:   Sun Oct 4 12:49:17 2015 +0200

    Merge branch 'master' into baldurs-gate

 Makefile                                      |   11 +-
 data/feeble-files.yaml                        | 1570 ++++++++++++++
 data/gobliiins.yaml                           |    2 +
 data/operation-stealth.wip                    |  334 +++
 data/quake2-groundzero-data.control.in        |    3 +
 data/quake2-reckoning-data.control.in         |    3 +
 data/quake2.yaml                              | 1863 +++++++++-------
 data/quake3.yaml                              |    4 +
 data/rtcw.yaml                                |  228 +-
 data/spear-of-destiny.yaml                    |  151 +-
 data/wikipedia.csv                            |    1 +
 data/wolf3d.yaml                              |  237 +--
 debian/TODO                                   |   19 +-
 debian/changelog                              |   22 +
 debian/control                                |    2 +
 etc/game-data-packager.conf                   |    6 +-
 game_data_packager/__init__.py                | 2798 ++-----------------------
 game_data_packager/{__init__.py => build.py}  | 1654 +++------------
 game_data_packager/config.py                  |   12 +-
 game_data_packager/games/doom_common.py       |   21 +-
 game_data_packager/games/ecwolf_common.py     |   18 +-
 game_data_packager/games/lgeneral.py          |   11 +-
 game_data_packager/games/quake.py             |   13 +-
 game_data_packager/games/quake2.py            |   13 +-
 game_data_packager/games/residualvm_common.py |   25 +-
 game_data_packager/games/scummvm_common.py    |   25 +-
 game_data_packager/games/z_code.py            |   18 +-
 game_data_packager/gog.py                     |   67 +-
 game_data_packager/make_template.py           |    4 +-
 game_data_packager/steam.py                   |  152 +-
 game_data_packager/util.py                    |   61 +
 tools/babel.py                                |   16 +-
 tools/check_syntax.py                         |    1 +
 tools/fake_lgog.py                            |   37 +-
 tools/spider.py                               |   13 +-
 tools/stats.py                                |   13 +-
 tools/yaml2json.py                            |   48 +-
 37 files changed, 4268 insertions(+), 5208 deletions(-)

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