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

[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 96bf5ce3d247c7374718c0f172a18cd2c43d032c
Merge: 83e29f8 68636eb
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Fri Jan 16 11:26:33 2015 +0100

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

 data/rtcw.yaml                     | 14 +++++++---
 data/wolf3d.yaml                   | 25 +++++++++++++++++
 debian/changelog                   |  3 ++
 debian/copyright                   | 23 +++++++++++++++-
 lib/game_data_packager/__init__.py | 56 +++++++++++++++++++++++++++++---------
 5 files changed, 103 insertions(+), 18 deletions(-)


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