[game-data-packager] 01/07: 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 61e24488a2023a8331f93ca63a91be3c2685e64d
Merge: dabea5e 7a72b1c
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon Oct 5 21:21:52 2015 +0200

    Merge branch 'master' into baldurs-gate

 data/atlantis.yaml                  |  165 +-
 data/brokensword1.yaml              |   16 +-
 data/chex.yaml                      |   19 +-
 data/comi.yaml                      |  248 +-
 data/cruise.yaml                    |   50 +-
 data/dig.yaml                       |  736 ++---
 data/doom.yaml                      |   56 +-
 data/doom2.yaml                     |  140 +-
 data/draci.yaml                     |  740 ++---
 data/dreamweb.yaml                  | 5051 +++++++++++++----------------------
 data/elvira2.yaml                   |  979 +++----
 data/feeble-files.yaml              | 1855 +++++++++++--
 data/final-doom.yaml                |   42 +-
 data/freespace2.yaml                |   71 +-
 data/future-wars.yaml               |   88 +-
 data/grimfandango.yaml              |  769 ++----
 data/hacx.yaml                      |   29 +-
 data/hexen.yaml                     |    1 +
 data/hexen2.yaml                    |   41 +-
 data/hhgg.yaml                      |    9 +-
 data/hugo.yaml                      |    1 +
 data/inherit.yaml                   |   68 +-
 data/ja.yaml                        |   16 +-
 data/kyrandia1.yaml                 | 1416 ++++------
 data/lands-of-lore.yaml             |  108 +-
 data/larry6.yaml                    |    2 +-
 data/loom.yaml                      |    3 +
 data/manhole.yaml                   |   10 +-
 data/maniacmansion.yaml             | 1915 +++++--------
 data/nomouth.yaml                   |  304 +--
 data/quake.yaml                     |  356 ++-
 data/quake2.yaml                    |   76 +-
 data/quake3.yaml                    |   32 +-
 data/rott.yaml                      |   30 +-
 data/rtcw.yaml                      |   37 +
 data/sam-and-max.yaml               |  171 +-
 data/sherlock-holmes1.yaml          |  611 ++---
 data/simon1.yaml                    |  914 +++----
 data/simon2.yaml                    |   63 +-
 data/soltys.yaml                    |   81 +-
 data/spear-of-destiny.yaml          |   31 +
 data/strife.yaml                    |   22 +-
 data/t7g.yaml                       |   23 +-
 data/tentacle.yaml                  |  196 +-
 data/theme-hospital.yaml            | 1586 +++++------
 data/waxworks.yaml                  |  959 +++----
 data/wikipedia.csv                  |    3 +
 data/wolf3d.yaml                    |  376 ++-
 data/zak.yaml                       |  931 +++----
 data/zork-inquisitor.yaml           |   53 +-
 data/zork.yaml                      |   49 +-
 debian/TODO                         |    8 +-
 debian/changelog                    |    1 +
 debian/game-data-packager.install   |    6 +
 debian/rules                        |    8 +-
 doc/adding_a_game.mdwn              |   11 +
 doc/tags.txt                        |    6 +-
 etc/game-data-packager.conf         |    2 +-
 game_data_packager/__init__.py      |   26 +-
 game_data_packager/build.py         |   11 +-
 game_data_packager/make_template.py |   32 +-
 tools/yaml2json.py                  |    8 +-
 62 files changed, 9203 insertions(+), 12464 deletions(-)

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