[game-data-packager] 04/12: Merge commit '559fe5b6a56d505a1dbb8c1714e4ea9655c3c537'

[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 6b3680d54644852a24cd362995dc71323bd968ba
Merge: 4f71269 559fe5b
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Jan 13 21:03:56 2015 +0000

    Merge commit '559fe5b6a56d505a1dbb8c1714e4ea9655c3c537'

 data/rott-extreme-data.control.in    | 16 ++++++++
 data/rott-extreme-data.copyright     | 20 ++++++++++
 data/rott-registered-data.control.in |  1 +
 data/rott.yaml                       | 39 +++++++++++++++++++
 data/wolf3d.yaml                     | 72 ++++++++++++++++++++++++++++++++++++
 5 files changed, 148 insertions(+)

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