[game-data-packager] 07/24: Merge remote-tracking branch 'a-detiste/master'

[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 9a8aaf9fba65b37e0af01e02127e014a1a8a00e0
Merge: d51ccf9 fa4a9f4
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jan 17 20:49:58 2015 +0000

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

 data/doom.yaml                                 |  1 -
 data/doom2.yaml                                |  1 -
 data/final-doom.yaml                           |  2 -
 data/heretic.yaml                              |  3 +-
 data/hexen.yaml                                |  5 +-
 data/hexen2.yaml                               |  5 +-
 data/ja.yaml                                   |  4 +-
 data/jk2.yaml                                  |  2 -
 data/quake.yaml                                |  7 ++-
 data/quake2.yaml                               |  3 +-
 data/quake3.yaml                               |  3 +-
 data/rott-data.control.in                      |  1 -
 data/rott.yaml                                 |  4 +-
 data/rtcw-data.control.in                      |  9 ----
 data/rtcw.yaml                                 |  5 +-
 data/spear-of-destiny-data.control.in          | 10 ----
 data/spear-of-destiny-mission2-data.control.in |  9 ----
 data/spear-of-destiny.yaml                     | 11 ++--
 data/tyrian.yaml                               |  1 -
 data/wolf3d.yaml                               |  3 +-
 lib/game_data_packager/__init__.py             | 75 +++++++++++++++++++++++---
 21 files changed, 93 insertions(+), 71 deletions(-)


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