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

[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 149ee7aeaef6a3618fb00c49b49b31f9a16d8a20
Merge: 100bdf4 218fd3f
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Jan 6 22:49:26 2015 +0100

    Merge tag 'upstream/0.9.21.1'
    
    Upstream version 0.9.21.1

 CMakeLists.txt                                 |   2 +-
 QTfrontend/hedgewars.qrc                       |   4 +
 QTfrontend/hwform.cpp                          |   4 +-
 QTfrontend/model/ammoSchemeModel.cpp           |   2 +-
 QTfrontend/model/ammoSchemeModel.h             |   2 +-
 QTfrontend/model/roomslistmodel.cpp            |  54 +-
 QTfrontend/model/roomslistmodel.h              |   2 -
 QTfrontend/net/newnetclient.h                  |   2 +-
 QTfrontend/res/html/about.html                 |   2 +-
 QTfrontend/res/iconDamageLockG.png             | Bin 0 -> 1168 bytes
 QTfrontend/res/iconDamageLockR.png             | Bin 0 -> 1188 bytes
 QTfrontend/res/iconTimeLockG.png               | Bin 0 -> 1527 bytes
 QTfrontend/res/iconTimeLockR.png               | Bin 0 -> 1503 bytes
 QTfrontend/ui/page/pageroomslist.cpp           |  38 +-
 QTfrontend/ui/page/pageroomslist.h             |   2 +
 cmake_modules/CheckHaskellModuleExists.cmake   |   4 +-
 cmake_modules/FindLua.cmake                    |   2 +-
 hedgewars/CMakeLists.txt                       |  16 +-
 hedgewars/config.inc.in                        |   4 -
 hedgewars/uChat.pas                            |  20 +-
 hedgewars/uRender.pas                          |   7 +-
 hedgewars/uStore.pas                           |  10 +-
 hedgewars/uVisualGearsHandlers.pas             |  30 +-
 project_files/hwc/CMakeLists.txt               |  12 +
 share/hedgewars/Data/Locale/hedgewars_ar.ts    | 855 ++++++++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_bg.ts    | 855 ++++++++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_cs.ts    | 855 ++++++++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_da.ts    | 855 ++++++++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_de.ts    |  64 +-
 share/hedgewars/Data/Locale/hedgewars_el.ts    | 855 ++++++++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_en.ts    | 855 ++++++++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_es.ts    | 855 ++++++++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_fi.ts    | 945 +++++++++++++++++++++++--
 share/hedgewars/Data/Locale/hedgewars_fr.ts    | 855 ++++++++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_gl.ts    | 855 ++++++++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_hu.ts    | 855 ++++++++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_it.ts    | 861 +++++++++++++++++++++-
 share/hedgewars/Data/Locale/hedgewars_ja.ts    | 855 ++++++++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_ko.ts    | 855 ++++++++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_lt.ts    | 280 ++++----
 share/hedgewars/Data/Locale/hedgewars_ms.ts    | 280 ++++----
 share/hedgewars/Data/Locale/hedgewars_nl.ts    | 855 ++++++++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_pl.ts    | 855 ++++++++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_pt_BR.ts | 855 ++++++++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_pt_PT.ts | 855 ++++++++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_ro.ts    | 855 ++++++++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_ru.ts    | 859 ++++++++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_sk.ts    | 855 ++++++++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_sv.ts    | 855 ++++++++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_tr_TR.ts | 855 ++++++++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_uk.ts    | 855 ++++++++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_zh_CN.ts | 280 ++++----
 share/hedgewars/Data/Locale/hedgewars_zh_TW.ts | 855 ++++++++++++++++++++++
 share/version_info.txt                         |   4 +-
 tools/pas2c/Pas2C.hs                           |   1 +
 tools/pas2c/PascalParser.hs                    |   2 +
 tools/pas2c/PascalUnitSyntaxTree.hs            |   1 +
 57 files changed, 22038 insertions(+), 568 deletions(-)

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