[hedgewars] 03/05: Merge tag 'upstream/0.9.22-dfsg'

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch master
in repository hedgewars.

commit 1eb8fe2b80c6fe88aa8a068b4cffa14a9c57201d
Merge: 8c6a438 8547f61
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Nov 2 12:00:44 2015 +0100

    Merge tag 'upstream/0.9.22-dfsg'
    
    Upstream version 0.9.22-dfsg

 CMakeLists.txt                                     |   2 +-
 CTestTestfile.cmake                                |  16 +++---
 ChangeLog.txt                                      |  13 ++++-
 QTfrontend/servermessages.h                        |  56 ++++++++++-----------
 gameServer/Actions.hs                              |   6 +--
 gameServer/CoreTypes.hs                            |   5 +-
 gameServer/EngineInteraction.hs                    |   9 ++--
 gameServer/OfficialServer/GameReplayStore.hs       |  11 ++--
 gameServer/OfficialServer/extdbinterface.hs        |  18 ++++---
 hedgewars/uGears.pas                               |   1 +
 hedgewars/uGearsHandlersMess.pas                   |  19 +++++--
 hedgewars/uGearsHandlersRope.pas                   |  10 ++--
 hedgewars/uGearsHedgehog.pas                       |   9 +++-
 hedgewars/uGearsList.pas                           |  12 ++++-
 hedgewars/uGearsUtils.pas                          |  14 +++---
 hedgewars/uScript.pas                              |  33 +++++++-----
 hedgewars/uTeams.pas                               |   1 -
 .../assets/Data/Sounds/Droplet1.ogg                | Bin 9084 -> 0 bytes
 .../assets/Data/Sounds/Droplet2.ogg                | Bin 7934 -> 0 bytes
 .../assets/Data/Sounds/Droplet3.ogg                | Bin 10485 -> 0 bytes
 share/hedgewars/Data/Locale/tips_en.xml            |   9 ++--
 share/hedgewars/Data/Maps/Basketball/map.lua       |   4 ++
 share/hedgewars/Data/Maps/Knockball/map.lua        |   4 ++
 share/hedgewars/Data/Maps/TrophyRace/map.lua       |   7 ++-
 share/hedgewars/Data/Sounds/Droplet1.ogg           | Bin 9084 -> 0 bytes
 share/hedgewars/Data/Sounds/Droplet2.ogg           | Bin 7934 -> 0 bytes
 share/hedgewars/Data/Sounds/Droplet3.ogg           | Bin 10485 -> 0 bytes
 share/version_info.txt                             |   4 +-
 28 files changed, 164 insertions(+), 99 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/hedgewars.git