[springlobby] 08/14: Merge tag 'upstream/0.222'

[Markus Koschany]

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

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

commit 393169befd3ed58296535543e9a8dbca123d2bc9
Merge: 7d21c79 719009d
Author: Markus Koschany <apo at gambaru.de>
Date:   Sat May 23 14:45:20 2015 +0200

    Merge tag 'upstream/0.222'
    
    Upstream version 0.222
    
    # gpg: Signature made Sat 23 May 2015 14:45:16 CEST 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]

 ChangeLog                                          |    19 +
 GroupOptions.fbp                                   |  1559 --
 VERSION                                            |     2 +-
 formbuilder/simpleSP.fbp                           |   467 -
 formbuilder/simplefront.fbp                        |   320 -
 springlobby_config.h                               |     2 +-
 src/CMakeLists.txt                                 |    16 +-
 src/autohostmanager.cpp                            |    27 +-
 src/autohostmanager.h                              |    34 +-
 src/battle.cpp                                     |    10 +
 src/battle.h                                       |     2 +
 src/chatlog.cpp                                    |     3 +-
 src/downloader/prdownloader.cpp                    |     7 +-
 src/gui/battlelist/battlelistctrl.cpp              |     2 +-
 src/gui/battlelist/battlelisttab.cpp               |    12 +-
 src/gui/battlelist/battlelisttab.h                 |     2 +-
 src/gui/channel/channellistctrl.h                  |    11 +
 src/gui/chatpanel.cpp                              |    88 +-
 src/gui/chatpanel.h                                |     2 +
 src/gui/customdialogs.cpp                          |    20 +-
 src/gui/customdialogs.h                            |     2 +
 src/gui/customvirtlistctrl.cpp                     |    40 +-
 src/gui/customvirtlistctrl.h                       |    54 +-
 src/gui/hosting/battlemaptab.cpp                   |    15 +-
 src/gui/hosting/battleoptionstab.cpp               |    13 +-
 src/gui/hosting/battleroomlistctrl.cpp             |    27 +
 src/gui/hosting/battleroomlistctrl.h               |     2 +
 src/gui/hosting/battleroommmoptionstab.cpp         |    25 +-
 src/gui/hosting/battleroomtab.cpp                  |    55 +-
 src/gui/hosting/mainjoinbattletab.h                |     4 +
 src/gui/hosting/votepanel.cpp                      |    12 +-
 src/gui/infodialog.cpp                             |    11 +-
 src/gui/infodialog.h                               |     5 +
 src/gui/mainchattab.cpp                            |    56 +-
 src/gui/mainchattab.h                              |     4 +-
 src/gui/maindownloadtab.cpp                        |    11 +-
 src/gui/maindownloadtab.h                          |     2 +-
 src/gui/mapctrl.cpp                                |    39 +-
 src/gui/mapselectdialog.cpp                        |    18 +-
 src/gui/mapselectdialog.h                          |     2 +-
 .../notifications/toasterbox/ToasterBoxWindow.cpp  |     2 +-
 src/gui/options/chatoptionstab.cpp                 |    13 +-
 src/gui/options/chatoptionstab.h                   |     1 -
 src/gui/options/downloadoptionspanel.cpp           |     6 +-
 src/gui/options/groupoptionspanel.cpp              |     9 +-
 src/gui/options/groupoptionspanel.h                |     2 +-
 src/gui/options/lobbyoptionstab.cpp                |     3 +-
 src/gui/options/lobbyoptionstab.h                  |     1 -
 src/gui/pastedialog.cpp                            |    14 +-
 src/gui/pastedialog.h                              |     1 +
 src/gui/selectusersdialog.cpp                      |    14 +-
 src/gui/selectusersdialog.h                        |     1 +
 src/gui/singleplayertab.cpp                        |     2 +-
 src/gui/singleplayertab.h                          |     1 +
 src/gui/sltipwin.cpp                               |    67 +-
 src/gui/sltipwin.h                                 |    21 +-
 src/gui/taskbar.cpp                                |     2 +-
 src/gui/textentrydialog.h                          |     4 +
 src/gui/ui.cpp                                     |    20 +-
 src/ibattle.cpp                                    |     4 +-
 src/ibattle.h                                      |     7 +-
 src/lsl/lib/cimg/CImg.h                            | 20545 +++++++++++--------
 src/lsl/src/lsl/battle/ibattle.cpp                 |     2 +-
 src/lsl/src/lslunitsync/image.cpp                  |    32 +-
 src/lsl/src/lslunitsync/image.h                    |     5 +-
 src/lsl/src/lslutils/misc.cpp                      |    43 +-
 src/lsl/src/lslutils/misc.h                        |     8 +-
 src/serverevents.cpp                               |    30 +-
 src/socket.cpp                                     |    14 +-
 src/spring.cpp                                     |     7 +-
 src/springsettings/frame.cpp                       |     5 +
 src/tasserver.cpp                                  |    71 +-
 src/tasserver.h                                    |     3 +
 src/tests/CMakeLists.txt                           |     1 +
 src/tests/lslconversion.cpp                        |    33 +
 src/tests/slpaths.cpp                              |     1 +
 src/user.h                                         |    12 +
 src/utils/platform.cpp                             |    38 +-
 src/utils/slpaths.cpp                              |    12 +-
 src/utils/slpaths.h                                |     2 +
 src/utils/tasutil.cpp                              |    15 +-
 wxsmith/AutoBalanceDialog.wxs                      |    91 -
 wxsmith/MainTorrentTab.wxs                         |    97 -
 wxsmith/MapSelectDialog.wxs                        |   164 -
 84 files changed, 13177 insertions(+), 11251 deletions(-)

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