[game-data-packager] 05/05: Merge branch 'master' of git+ssh://scm.alioth.debian.org//git/pkg-games/game-data-packager into steam

[Alexandre Detiste]

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

detiste-guest pushed a commit to branch steam
in repository game-data-packager.

commit dce9a33853a43e4b196aecb47794030697ae060d
Merge: e8542aa c0f765c
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Tue Apr 7 15:46:32 2015 +0200

    Merge branch 'master' of git+ssh://scm.alioth.debian.org//git/pkg-games/game-data-packager into steam

 data/doom2.yaml                     |    2 +-
 data/doom3.yaml                     |   12 +
 data/freespace2.yaml                | 1128 +++++++++++++++++++++++++++++++++++
 data/hacx.yaml                      |    2 +-
 data/ja.yaml                        |    2 +
 data/quake.yaml                     |    1 +
 data/quake2.yaml                    |   17 +-
 data/strife.yaml                    |    1 +
 data/syndicate.yaml                 |    1 -
 data/theme-hospital.yaml            |    2 +-
 data/tyrian.yaml                    |    3 +
 data/wolf3d.yaml                    |    6 +-
 debian/changelog                    |    1 +
 game_data_packager/__init__.py      |    6 +
 game_data_packager/make_template.py |   37 +-
 15 files changed, 1204 insertions(+), 17 deletions(-)

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