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 51f6b46e00d4b7ce801749a916f58b702fb4b604 Merge: dc8ae10 6a3d761 Author: Simon McVittie <[email protected]> Date: Thu Jan 15 09:43:53 2015 +0000 Merge remote-tracking branch 'a-detiste/master' Conflicts: debian/changelog data/quake2.yaml | 4 ++ data/wolf3d-full-data.control.in | 14 +++++ data/wolf3d-full-data.copyright | 20 +++++++ data/wolf3d.yaml | 118 ++++++++++++++++++++++++++++++++++++++- debian/changelog | 2 +- 5 files changed, 156 insertions(+), 2 deletions(-) diff --cc debian/changelog index a69d6d0,e94e60b..7947d58 --- a/debian/changelog +++ b/debian/changelog @@@ -5,7 -5,7 +5,8 @@@ game-data-packager (39) UNRELEASED; urg [ Alexandre Detiste ] * Add game Spear Of Destiny, demo & full version * Add game Rise of the Triad: Dark War (rott-registered-data) + (floppy, CD and site-license versions are supported) + * Add Wolfenstein 3D: full version (wolf3d-full-data), Closes: #745081 * Add bash completion [ Simon McVittie ] -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
