[game-data-packager] 03/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 66743aa4a27d9a5d00a75c71af1911b0268af6f6
Merge: fca91d2 d4934be
Author: Markus Koschany <apo at gambaru.de>
Date:   Wed Oct 7 10:21:33 2015 +0200

    Merge branch 'master' into baldurs-gate

 data/arx.yaml                       | 350 ++++++++++++++++--------------------
 data/blakestone.yaml                | 117 +++++-------
 data/duke3d.yaml                    |  56 ++----
 data/ecoquest1.yaml                 | 142 +++++++++++++++
 data/elvira1.yaml                   |  77 +++-----
 data/glory1.yaml                    |  21 +--
 data/gobliiins.yaml                 |  90 ++++------
 data/gobliins2.yaml                 |  11 +-
 data/goblins3.yaml                  | 136 ++++++++++----
 data/hank.yaml                      |  82 ++++-----
 data/hugo.yaml                      | 199 ++++++++------------
 data/lost-in-time.yaml              |  93 ++++------
 data/noahs-ark.yaml                 |  22 +--
 data/operation-stealth.wip          |  76 +++-----
 data/quake2.yaml                    | 216 ++++++++++------------
 data/sfinx.yaml                     |  37 ++--
 data/spacequest4.yaml               |  34 ++--
 debian/TODO                         |   1 -
 debian/changelog                    |   1 +
 debian/control                      |   1 +
 game_data_packager/__init__.py      |   3 -
 game_data_packager/build.py         |   2 +-
 game_data_packager/make_template.py | 129 ++++++++++---
 23 files changed, 937 insertions(+), 959 deletions(-)

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