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

[Alexandre Detiste]

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

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

commit ce6957a21eb8928dec9201ecf003513278793177
Merge: 013861d e503fdb
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Fri Dec 25 09:04:01 2015 +0100

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

 Makefile                                           |  10 +-
 .../operation-stealth.yaml}                        |   0
 data/{policequest4.wip => wip/policequest4.yaml}   |   0
 data/{spacequest6.wip => wip/spacequest6.yaml}     |   0
 data/{warcraft2.wip => wip/warcraft2.yaml}         |   0
 debian/control                                     |   2 +
 doc/tags.txt                                       |   2 +-
 game_data_packager/__init__.py                     |   7 +
 game_data_packager/build.py                        | 142 +++----
 game_data_packager/make_template.py                | 190 +++++----
 game_data_packager/unpack/__init__.py              | 282 +++++++++++++
 game_data_packager/unpack/__main__.py              |  44 ++
 game_data_packager/unpack/umod.py                  | 445 +++++++++++++++++++++
 tests/__init__.py                                  |   0
 tests/umod.py                                      | 103 +++++
 15 files changed, 1049 insertions(+), 178 deletions(-)

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