[pcsx2] 02/02: Merge tag 'upstream/1.3.1+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 620dd3ab05600adb32f4e9aea3119b05767ce338
Merge: ca4886d 5b38cca
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date:   Wed Jul 1 02:56:34 2015 -0400

    Merge tag 'upstream/1.3.1+dfsg'
    
    Upstream version 1.3.1+dfsg
    
    # gpg: Signature made Wed 01 Jul 2015 02:56:33 AM EDT using RSA key ID 3FF1F693
    # gpg: Good signature from "Miguel A. Colón Vélez <debian.micove at gmail.com>"

 bin/docs/pcsx2.1                            |   8 +-
 cmake/ApiValidation.cmake                   |  45 ----
 cmake/BuildParameters.cmake                 |  16 +-
 cmake/SearchForStuff.cmake                  |  38 +--
 common/include/Pcsx2Types.h                 |  11 +
 common/include/Utilities/General.h          |   2 +-
 common/include/Utilities/PersistentThread.h |   4 +-
 common/include/intrin_x86.h                 |  19 +-
 common/src/Utilities/FastFormatString.cpp   |  25 +-
 common/src/Utilities/Mutex.cpp              |   2 +-
 common/src/Utilities/ThreadTools.cpp        |  30 +--
 locales/it_IT/pcsx2_Iconized.po             |  12 +-
 locales/it_IT/pcsx2_Main.po                 | 380 +++++++++++++++-------------
 pcsx2/CDVD/CompressedFileReader.cpp         |  47 ++--
 pcsx2/CMakeLists.txt                        |  21 +-
 pcsx2/Patch.cpp                             |  16 +-
 pcsx2/SysForwardDefs.h                      |   2 +-
 pcsx2/System.cpp                            |  25 +-
 pcsx2/System.h                              |   2 +
 pcsx2/gui/AppCoreThread.cpp                 |  18 +-
 pcsx2/gui/AppInit.cpp                       |  15 +-
 pcsx2/gui/Panels/CpuPanel.cpp               |  16 ++
 pcsx2/x86/iCore.h                           |   2 +
 pcsx2/x86/iFPU.cpp                          |   6 +
 pcsx2/x86/iFPU.h                            |   3 +
 pcsx2/x86/iFPUd.cpp                         |   3 +
 pcsx2/x86/ix86-32/iR5900-32.cpp             |   6 +
 pcsx2/x86/ix86-32/iR5900Templates.cpp       |   4 +-
 pcsx2/x86/microVU_Compile.inl               |   2 +
 pcsx2/x86/sVU_Micro.cpp                     |   2 -
 pcsx2/x86/sVU_Micro.h                       |   2 -
 plugins/GSdx/GSSettingsDlg.cpp              |   4 +-
 plugins/GSdx/GSWndWGL.cpp                   |   4 +-
 33 files changed, 451 insertions(+), 341 deletions(-)

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