[game-data-packager] 04/11: Merge remote-tracking branch 'a-detiste/wolf3d_yaml'

[Simon McVittie]

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

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

commit 23997c99b6fb328f2bc1eb44b30239c70df7e83a
Merge: 3182043 8a58a41
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Jan 12 21:49:45 2015 +0000

    Merge remote-tracking branch 'a-detiste/wolf3d_yaml'

 Makefile                                           |   2 -
 .../control.in => data/wolf3d-demo-data.control.in |   4 +-
 .../copyright => data/wolf3d-demo-data.copyright   |   2 +-
 data/wolf3d.yaml                                   |  96 ++++++++++++++++
 lib/game_data_packager/__init__.py                 |  12 ++
 lib/game_data_packager/games/wolf3d.py             |  33 ++++++
 supported/wolf3d                                   | 128 +--------------------
 wolf3d-data/README.Debian                          |   4 -
 wolf3d.mk                                          |  35 ------
 9 files changed, 146 insertions(+), 170 deletions(-)


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