[game-data-packager] 03/08: Merge branch 'master' of https://alioth.debian.org/anonscm/git/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 64cf0dca1ca1eb98e5810bc6309ffe33d5ff640d
Merge: 0e9a58b 3ad03e0
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Mon Dec 29 08:15:09 2014 +0100

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

 Makefile                       |  4 +++
 debian/changelog               | 20 +++++++++++-
 debian/control                 |  8 +++--
 doc/todo.mdwn                  |  2 ++
 lib/game-data-packager-shared  | 50 ++++++++++++++++++++++++++---
 lib/q2mp-common                | 53 +++++++++++++++++++++++++++++++
 quake2.mk                      |  6 ++++
 quake2/quake2-rogue.control    | 14 +++++++++
 quake2/quake2-rogue.copyright  | 22 +++++++++++++
 quake2/quake2-xatrix.control   | 14 +++++++++
 quake2/quake2-xatrix.copyright | 22 +++++++++++++
 supported/doom2                |  2 +-
 supported/hexen2               |  2 +-
 supported/lgeneral             |  5 +--
 supported/q2rogue              | 67 +++++++++++++++++++++++++++++++++++++++
 supported/q2xatrix             | 71 ++++++++++++++++++++++++++++++++++++++++++
 supported/quake                | 15 ++++-----
 supported/quake2               |  5 +--
 supported/wolf3d               |  1 +
 tests/lib/require_program      | 13 ++++++++
 tests/runtests                 |  7 +++++
 21 files changed, 378 insertions(+), 25 deletions(-)


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