[corsix-th] 02/05: Merge branch 'master' of https://anonscm.debian.org/cgit/pkg-games/corsix-th

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository corsix-th.

commit 87d39d16f1f65bab95b6d5e2fbafc66d11f066fc
Merge: de29982 f342d3a
Author: Markus Koschany <apo at debian.org>
Date:   Mon Dec 21 00:54:03 2015 +0100

    Merge branch 'master' of https://anonscm.debian.org/cgit/pkg-games/corsix-th

 CMake/FindLua.cmake                              |   4 +-
 debian/README.Source                             |   3 +
 debian/copyright                                 | 178 +++++++++++++++++++++++
 debian/corsix-th.6                               |  32 +++-
 debian/corsix-th.desktop                         |   2 +-
 debian/patches/default_config.patch              |  27 ++++
 debian/patches/fix-parameters-to-sws_scale.patch |  20 +++
 debian/patches/series                            |   2 +
 debian/rules                                     |   3 +
 debian/scripts/corsix-th                         |   2 +-
 debian/source.lintian-overrides                  |   2 +
 11 files changed, 270 insertions(+), 5 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/corsix-th.git