[hedgewars] 02/03: Merge tag 'upstream/0.9.20.3'

[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 2f350c07c798a02ed6e7795011e39ea7e4db8876
Merge: 20e0854 7b18fb0
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu Jan 2 12:34:10 2014 +0100

    Merge tag 'upstream/0.9.20.3'
    
    Upstream version 0.9.20.3

 CMakeLists.txt                              |  10 +--
 QTfrontend/CMakeLists.txt                   |   4 +-
 QTfrontend/res/css/chat.css                 |   2 +-
 QTfrontend/servermessages.h                 |  12 +--
 QTfrontend/ui/page/pagemain.cpp             |   8 +-
 cmake_modules/CMakePascalInformation.cmake  |   4 +-
 cmake_modules/paths.cmake                   |  28 ++++---
 cmake_modules/platform.cmake                |  36 ++++-----
 gameServer/Actions.hs                       |   3 +-
 gameServer/CoreTypes.hs                     |   2 +-
 gameServer/OfficialServer/checker.hs        |   6 +-
 gameServer/OfficialServer/extdbinterface.hs |  13 +--
 hedgewars/CMakeLists.txt                    |   4 +
 hedgewars/uGearsHandlersMess.pas            |   2 +-
 hedgewars/uLand.pas                         |   4 +-
 hedgewars/uLandGraphics.pas                 | 118 ++++++++++++++--------------
 misc/libphysfs/platform_unix.c              |   2 +-
 share/hedgewars/Data/misc/hedgewars.desktop |   2 +-
 share/version_info.txt                      |   4 +-
 tools/CreateMacBundle.cmake.in              |  18 +++--
 20 files changed, 143 insertions(+), 139 deletions(-)

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