[pcsx2] 02/03: Merge tag 'upstream/1.2.1-854-ga3cd81c+dfsg'

[Miguel A. Colón Vélez]

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

micove-guest pushed a commit to branch master
in repository pcsx2.

commit cdfbaa386628fc80bc3fd0c73d53893780a9e16a
Merge: 93cae05 46c9401
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date:   Wed Jan 7 17:52:47 2015 -0500

    Merge tag 'upstream/1.2.1-854-ga3cd81c+dfsg'
    
    Upstream version 1.2.1-854-ga3cd81c+dfsg
    
    # gpg: Signature made Wed 07 Jan 2015 05:52:47 PM EST using RSA key ID 3FF1F693
    # gpg: Good signature from "Miguel A. Colón Vélez <debian.micove at gmail.com>"

 CMakeLists.txt                           |  14 +-
 bin/GameIndex.dbf                        | 445 ++++++++-------
 bin/PCSX2_keys.ini.default               |  80 +++
 build.sh                                 |  73 +--
 cmake/ApiValidation.cmake                |  72 +++
 cmake/BuildParameters.cmake              | 134 ++---
 cmake/CheckLib.cmake                     |   2 +-
 cmake/FindGTK3.cmake                     | 919 +++++++++++++++++++++++++++++++
 cmake/Pcsx2Utils.cmake                   |  71 ++-
 cmake/SearchForStuff.cmake               |  99 ++--
 cmake/SelectPcsx2Plugins.cmake           |  21 +-
 cmake/TargetArch.cmake                   | 169 ++++++
 cmake/darwin-compiler-i386-clang.cmake   |  17 +
 cmake/darwin-compiler-i386-generic.cmake |  17 +
 cmake/linux-compiler-i386-multilib.cmake |  49 ++
 common/include/Utilities/SafeArray.inl   |   2 +-
 common/src/Utilities/Console.cpp         |   2 +-
 linux_various/pcsx2.desktop.in           |   1 +
 locales/ar_SA/pcsx2_Iconized.po          |   8 +-
 locales/ar_SA/pcsx2_Main.po              |  30 +-
 locales/ca_ES/pcsx2_Iconized.po          |   8 +-
 locales/ca_ES/pcsx2_Main.po              |  30 +-
 locales/cs_CZ/pcsx2_Iconized.po          |   8 +-
 locales/cs_CZ/pcsx2_Main.po              |  30 +-
 locales/de_DE/pcsx2_Iconized.po          |   8 +-
 locales/de_DE/pcsx2_Main.po              |  30 +-
 locales/es_ES/pcsx2_Iconized.po          |   8 +-
 locales/es_ES/pcsx2_Main.po              |  30 +-
 locales/fi_FI/pcsx2_Iconized.po          |   8 +-
 locales/fi_FI/pcsx2_Main.po              |  30 +-
 locales/fr_FR/pcsx2_Iconized.po          |   8 +-
 locales/fr_FR/pcsx2_Main.po              |  30 +-
 locales/hr_HR/pcsx2_Iconized.po          |   8 +-
 locales/hr_HR/pcsx2_Main.po              |  30 +-
 locales/hu_HU/pcsx2_Iconized.po          |   8 +-
 locales/hu_HU/pcsx2_Main.po              |  30 +-
 locales/id_ID/pcsx2_Iconized.po          |   8 +-
 locales/id_ID/pcsx2_Main.po              |  30 +-
 locales/it_IT/pcsx2_Iconized.po          |  49 +-
 locales/it_IT/pcsx2_Main.po              |  51 +-
 locales/ja_JP/pcsx2_Iconized.po          |   8 +-
 locales/ja_JP/pcsx2_Main.po              |  30 +-
 locales/ko_KR/pcsx2_Iconized.po          |   8 +-
 locales/ko_KR/pcsx2_Main.po              |  30 +-
 locales/ms_MY/pcsx2_Iconized.po          |   8 +-
 locales/ms_MY/pcsx2_Main.po              |  30 +-
 locales/nb_NO/pcsx2_Iconized.po          |   8 +-
 locales/nb_NO/pcsx2_Main.po              |  30 +-
 locales/pl_PL/pcsx2_Iconized.po          |   8 +-
 locales/pl_PL/pcsx2_Main.po              |  30 +-
 locales/pt_BR/pcsx2_Iconized.po          |  13 +-
 locales/pt_BR/pcsx2_Main.po              |  49 +-
 locales/ru_RU/pcsx2_Iconized.po          |   8 +-
 locales/ru_RU/pcsx2_Main.po              |  30 +-
 locales/sv_SE/pcsx2_Iconized.po          |  74 +--
 locales/sv_SE/pcsx2_Main.po              | 139 +++--
 locales/templates/pcsx2_Iconized.pot     |   8 +-
 locales/templates/pcsx2_Main.pot         |  30 +-
 locales/th_TH/pcsx2_Iconized.po          |   8 +-
 locales/th_TH/pcsx2_Main.po              |  30 +-
 locales/tr_TR/pcsx2_Iconized.po          |   8 +-
 locales/tr_TR/pcsx2_Main.po              |  30 +-
 locales/zh_CN/pcsx2_Iconized.po          |   8 +-
 locales/zh_CN/pcsx2_Main.po              |  30 +-
 locales/zh_TW/pcsx2_Iconized.po          |   8 +-
 locales/zh_TW/pcsx2_Main.po              |  30 +-
 pcsx2/CDVD/CompressedFileReader.cpp      |  80 ++-
 pcsx2/CMakeLists.txt                     |  10 +-
 pcsx2/Patch.cpp                          |   6 +-
 pcsx2/gui/App.h                          |   4 +
 pcsx2/gui/AppConfig.cpp                  |  20 +-
 pcsx2/gui/AppConfig.h                    |   5 +-
 pcsx2/gui/AppCoreThread.cpp              |   4 +-
 pcsx2/gui/AppInit.cpp                    |   3 +
 pcsx2/gui/AppMain.cpp                    |   3 +-
 pcsx2/gui/ConsoleLogger.cpp              |  16 +
 pcsx2/gui/ConsoleLogger.h                |   1 +
 pcsx2/gui/Dialogs/ConfigurationDialog.h  |  17 +
 pcsx2/gui/Dialogs/FirstTimeWizard.cpp    |  11 +-
 pcsx2/gui/Dialogs/SysConfigDialog.cpp    |  13 +
 pcsx2/gui/GlobalCommands.cpp             |  48 +-
 pcsx2/gui/MainMenuClicks.cpp             |  22 +-
 pcsx2/gui/Panels/ConfigurationPanels.h   |   2 +-
 pcsx2/gui/Panels/MiscPanelStuff.cpp      |  16 +-
 pcsx2/gui/i18n.cpp                       |  40 +-
 pcsx2/x86/ix86-32/iR5900-32.cpp          |   2 +-
 pcsx2/x86/microVU_Compile.inl            |   2 +-
 plugins/GSdx/GS.cpp                      |   4 +
 plugins/GSdx/GSSettingsDlg.cpp           |   2 +
 plugins/GSdx/config.h                    |   2 +-
 plugins/zzogl-pg/opengl/Win32/ps2hw.dat  | Bin 108445 -> 0 bytes
 plugins/zzogl-pg/opengl/ps2hw.dat        | Bin 113923 -> 0 bytes
 92 files changed, 2602 insertions(+), 1091 deletions(-)

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