[game-data-packager] 06/06: Merge branch 'master' of git://anonscm.debian.org/pkg-games/game-data-packager

[Markus Koschany]

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

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

commit ab9cfb24a72b4531faee8eeafc4b1039affd46ef
Merge: 5231588 703b69b
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon Oct 12 13:54:27 2015 +0200

    Merge branch 'master' of git://anonscm.debian.org/pkg-games/game-data-packager

 data/comi.yaml                 | 231 ++++++++++++++++++++---------------------
 data/compet-n.yaml             |   1 +
 data/doom3.yaml                |   1 +
 data/enclosure.yaml            |   1 +
 data/freespace2.yaml           |   1 +
 data/hank.yaml                 |   1 +
 data/ja.yaml                   |   1 +
 data/rtcw.yaml                 |  44 +++++++-
 data/zork-nemesis.yaml         |   2 +
 debian/changelog               |   4 +-
 doc/tags.txt                   |   2 +-
 game_data_packager/__init__.py |  25 ++++-
 tools/stats.py                 |  49 ++++-----
 13 files changed, 209 insertions(+), 154 deletions(-)


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