[game-data-packager] 06/08: 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 cf5d8e2243612853190bb3284394ede5e0c36296
Merge: 68636eb 1abb8c4
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Jan 16 10:26:00 2015 +0000

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

 data/rott.yaml                     | 14 +++++++-------
 data/spear-of-destiny.yaml         | 12 ++++++++----
 data/wolf3d.yaml                   | 12 ++++++++----
 doc/adding_a_game.mdwn             |  6 +++++-
 lib/game_data_packager/__init__.py | 10 +++++++++-
 5 files changed, 37 insertions(+), 17 deletions(-)


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