[game-data-packager] 05/07: Merge branch 'master' into baldurs-gate

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch baldurs-gate
in repository game-data-packager.

commit c779c023c03e2bdcf9956620f16201246e585476
Merge: 75aec4d 8556f73
Author: Markus Koschany <apo at gambaru.de>
Date:   Sat Oct 10 14:57:34 2015 +0200

    Merge branch 'master' into baldurs-gate

 data/atlantis.yaml                         |    1 +
 data/bash-completion/game-data-packager    |    4 +-
 data/descent1.yaml                         |   67 +-
 data/dig.yaml                              |    5 -
 data/dune2.yaml                            |  181 +-
 data/ecoquest1.yaml                        |    2 +
 data/ecoquest2.yaml                        |  151 +
 data/enemy-territory.yaml                  |    2 +
 data/feeble-files.yaml                     | 5596 +++++++++++++++++++++++++---
 data/larry1.yaml                           |    1 -
 data/quake.yaml                            |   36 +-
 data/quake2.yaml                           |    4 +-
 data/quake3-data.control.in                |    8 -
 data/quake3-team-arena-data.control.in     |   11 -
 data/quake3.yaml                           |    9 +
 data/rott-extreme-data.control.in          |    5 -
 data/rott-registered-data.control.in       |    6 -
 data/rott.yaml                             |    9 +-
 data/rtcw-data.control.in                  |    8 -
 data/rtcw.yaml                             |  170 +-
 data/spear-of-destiny-demo-data.control.in |    5 -
 data/spear-of-destiny.yaml                 |   22 +-
 data/wikipedia.csv                         |   12 +
 data/wolf3d-demo-data.control.in           |    4 -
 data/wolf3d.yaml                           |   29 +
 data/zork.yaml                             |   57 +-
 debian/TODO                                |    1 -
 debian/changelog                           |    2 +-
 debian/control                             |    2 +-
 doc/adding_a_game.mdwn                     |   11 +-
 doc/tags.txt                               |    1 +
 game_data_packager/__init__.py             |    6 +-
 game_data_packager/build.py                |   90 +-
 game_data_packager/make_template.py        |   37 +-
 game_data_packager/util.py                 |   15 +-
 35 files changed, 5740 insertions(+), 830 deletions(-)

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