[marsshooter] 04/28: Merge tag 'upstream/0.7.5+git20160103'

[Markus Koschany]

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

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

commit cc5d3dd7e43e18630dceff4e80ab2a1ca0e6d641
Merge: 19d126b 713e45e
Author: Markus Koschany <apo at debian.org>
Date:   Sun Jan 3 15:51:54 2016 +0100

    Merge tag 'upstream/0.7.5+git20160103'
    
    Upstream version 0.7.5+git20160103
    
    # gpg: Signature made Sun 03 Jan 2016 15:51:49 CET using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]

 CMakeLists.txt                          |  10 +-
 data/locales/Gaelic.txt                 | 376 ++++++++++++++++++++++++++++++++
 data/locales/locales.conf               |   4 +
 premake4.lua                            |   8 +-
 resources/mars.desktop                  |  11 -
 resources/marsshooter.6                 |  36 +++
 resources/marsshooter.appdata.xml       |  29 +++
 resources/marsshooter.desktop           |  12 +
 resources/{mars.png => marsshooter.png} | Bin
 resources/{mars.svg => marsshooter.svg} |   0
 resources/{mars.xpm => marsshooter.xpm} |   0
 src/CMakeLists.txt                      |  43 ++--
 src/Media/music.cpp                     |   2 +
 src/Shaders/postFX.cpp                  |   2 +-
 src/System/window.cpp                   |  18 +-
 src/main.cpp                            |  10 +-
 16 files changed, 516 insertions(+), 45 deletions(-)

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