[ufoai] 06/20: Merge tag 'upstream/2.5'

[Markus Koschany]

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

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

commit 3c584dd115bb5aa6c0fa071cfeb41d18adeecddd
Merge: 993e383 9e37d63
Author: Markus Koschany <apo at debian.org>
Date:   Sun Nov 22 01:43:20 2015 +0100

    Merge tag 'upstream/2.5'
    
    Upstream version 2.5
    
    # gpg: Unterschrift vom So 22 Nov 2015 01:43:16 CET mittels RSA-Schlüssel ID 513B51E4
    # gpg: Korrekte Unterschrift von "Markus Koschany <apo at gambaru.de>" [uneingeschränkt]
    # gpg:                     alias "Markus Koschany <markus at koschany.net>" [uneingeschränkt]
    # gpg:                     alias "Markus Koschany <apo at debian.org>" [uneingeschränkt]

 LICENSES                                           |    61 +-
 base/ufos/models.ufo                               |     6 +-
 base/ufos/ui/campaign.ufo                          |    19 +-
 base/ufos/ui/equipment.ufo                         |     7 +-
 base/ufos/ui/stats.ufo                             |     2 +-
 build/platforms/darwin.mk                          |     1 +
 src/client/battlescape/cl_actor.cpp                |     4 -
 src/client/battlescape/cl_particle.cpp             |     2 +-
 .../events/event/actor/e_event_actorendshot.cpp    |     7 +-
 .../events/event/actor/e_event_actorstartshoot.cpp |     1 +
 .../events/event/inventory/e_event_invdel.cpp      |     2 +-
 src/client/cgame/campaign/cp_campaign.cpp          |     1 +
 src/client/cgame/campaign/cp_employee.cpp          |    12 +-
 src/client/cgame/campaign/cp_geoscape.cpp          |     2 +-
 src/client/cgame/skirmish/cl_game_skirmish.cpp     |     2 +
 src/client/renderer/r_font.cpp                     |     1 +
 src/client/renderer/r_state.cpp                    |     6 +-
 src/client/sound/s_music.cpp                       |    14 +-
 src/game/g_actor.cpp                               |     2 +-
 src/game/g_combat.cpp                              |     9 +-
 src/game/g_inventory.cpp                           |     1 +
 src/game/g_reaction.cpp                            |     2 +-
 src/game/g_trigger.cpp                             |     2 +-
 src/game/g_vis.cpp                                 |     2 +-
 src/po/ufoai-de.po                                 | 22288 +++++--------------
 src/shared/mathlib.h                               |     1 +
 .../radiant/radiant/ui/colourscheme/ColourScheme.h |     2 -
 .../ui/colourscheme/ColourSchemeManager.cpp        |    36 +-
 28 files changed, 5362 insertions(+), 17133 deletions(-)

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