[pcsx2] 02/03: Merge tag 'upstream/1.3.1-1008-g9f291a6+dfsg'

Miguel A. Colón Vélez micove-guest at moszumanska.debian.org
Sat Aug 22 15:44:19 UTC 2015


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

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

commit 681ba5ee9498a2b37e127a7964b0889995921023
Merge: baba52e ee25511
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date:   Thu Aug 20 06:01:09 2015 -0400

    Merge tag 'upstream/1.3.1-1008-g9f291a6+dfsg'
    
    Upstream version 1.3.1-1008-g9f291a6+dfsg
    
    # gpg: Signature made Thu 20 Aug 2015 06:01:09 AM EDT using RSA key ID 3FF1F693
    # gpg: Good signature from "Miguel A. Colón Vélez <debian.micove at gmail.com>"

 CMakeLists.txt                                     |    21 +-
 pcsx2_suite_2010.sln => PCSX2_suite.sln            |   815 +-
 bin/GameIndex.dbf                                  | 58729 ++++++++++---------
 bin/PCSX2-linux.sh                                 |    75 +
 bin/PCSX2_keys.ini.default                         |   161 +-
 bin/cheats/DE37E046.pnach                          |    30 +-
 bin/docs/{pcsx2.1 => PCSX2.1}                      |     0
 bin/docs/PCSX2_Readme.pdf                          |   Bin 104419 -> 497625 bytes
 bin/launch_pcsx2_linux.sh                          |   112 -
 bin/run_spu2_replay.cmd                            |     2 +-
 bin/shaders/GSdx.fx                                |  1162 +-
 bin/shaders/GSdx_FX_Settings.ini                   |   275 +-
 build.cmd                                          |     2 +-
 build.sh                                           |     4 +-
 clean_msvc.cmd                                     |    58 +-
 cmake/BuildParameters.cmake                        |    71 +-
 cmake/CheckLib.cmake                               |    32 +-
 cmake/Pcsx2Utils.cmake                             |     3 +-
 cmake/SearchForStuff.cmake                         |    24 +-
 cmake/SelectPcsx2Plugins.cmake                     |    78 +-
 cmake/linux-compiler-i386-multilib.cmake           |     8 +-
 common/build/Utilities/utilities.vcxproj           |    17 +-
 common/build/Utilities/utilities.vcxproj.filters   |     5 +-
 common/build/Utilities/utilities_vs2012.vcxproj    |   197 -
 .../Utilities/utilities_vs2012.vcxproj.filters     |   226 -
 common/build/Utilities/utilities_vs2013.vcxproj    |   197 -
 .../Utilities/utilities_vs2013.vcxproj.filters     |   226 -
 common/build/x86emitter/x86emitter.vcxproj         |    15 +-
 common/build/x86emitter/x86emitter.vcxproj.filters |     5 +-
 common/build/x86emitter/x86emitter_vs2012.vcxproj  |   157 -
 .../x86emitter/x86emitter_vs2012.vcxproj.filters   |   150 -
 common/build/x86emitter/x86emitter_vs2013.vcxproj  |   157 -
 .../x86emitter/x86emitter_vs2013.vcxproj.filters   |   150 -
 common/include/PS2Edefs.h                          |     2 +
 common/include/PS2Eext.h                           |     2 +-
 common/include/Pcsx2Types.h                        |     3 +-
 common/include/PluginCallbacks.h                   |     9 +-
 common/include/Utilities/Console.h                 |     8 +-
 common/include/Utilities/Dependencies.h            |    10 +
 common/include/Utilities/General.h                 |     2 +
 common/include/Utilities/HashMap.h                 |     2 -
 .../include/Utilities/MathUtils.h                  |    31 +-
 common/include/Utilities/RedtapeWindows.h          |     2 +-
 common/include/Utilities/StringHelpers.h           |    10 +-
 common/include/Utilities/lnx_memzero.h             |    15 +-
 common/include/Utilities/win_memzero.h             |    95 -
 common/include/Utilities/wxAppWithHelpers.h        |     6 +-
 common/include/Utilities/wxGuiTools.h              |     3 +-
 common/include/x86emitter/legacy_instructions.h    |    28 -
 common/include/x86emitter/legacy_internal.h        |     3 +
 common/src/Utilities/AlignedMalloc.cpp             |    59 +-
 common/src/Utilities/CMakeLists.txt                |    53 +-
 common/src/Utilities/Console.cpp                   |    14 +-
 common/src/Utilities/Exceptions.cpp                |     2 +-
 common/src/Utilities/Linux/LnxMisc.cpp             |     4 +
 common/src/Utilities/VirtualMemory.cpp             |     8 +
 common/src/Utilities/Windows/WinMisc.cpp           |     7 +
 common/src/Utilities/pxRadioPanel.cpp              |     2 +
 common/src/Utilities/pxTranslate.cpp               |    12 +-
 common/src/Utilities/vssprintf.cpp                 |   111 +-
 common/src/Utilities/wxHelpers.cpp                 |    32 +-
 common/src/x86emitter/3dnow.cpp                    |   199 -
 common/src/x86emitter/CMakeLists.txt               |    48 +-
 common/src/x86emitter/simd.cpp                     |     7 -
 common/svn_readme.txt                              |    32 +-
 common/vsprops/BaseProperties.props                |     4 +-
 common/vsprops/CommonLibrary.props                 |     2 +-
 common/vsprops/postBuild.unknown                   |    98 +-
 common/vsprops/preBuild.cmd                        |   108 +-
 common/vsprops/readme.txt                          |    58 +-
 common/vsprops/wxWidgetsGui.props                  |    16 +-
 debian-packager/README.Debian                      |    58 +-
 debian-packager/control                            |    29 +-
 debian-packager/copyright                          |     2 +-
 debian-packager/docs                               |     2 +-
 debian-packager/install                            |    11 +-
 debian-packager/manpages                           |     2 +-
 debian-packager/menu                               |     4 +-
 debian-packager/watch                              |     2 +-
 .../{pcsx2.desktop.in => PCSX2.desktop.in}         |     4 +-
 linux_various/{pcsx2.xpm => PCSX2.xpm}             |     0
 linux_various/generate_pot.sh                      |     4 +-
 linux_various/glsl2h.pl                            |    36 +-
 linux_various/validate_glsl.sh                     |    25 +-
 locales/it_IT/pcsx2_Iconized.po                    |    92 +-
 locales/it_IT/pcsx2_Main.po                        |   659 +-
 locales/pt_BR/pcsx2_Iconized.po                    |    28 +-
 locales/pt_BR/pcsx2_Main.po                        |   491 +-
 locales/ru_RU/pcsx2_Main.po                        |     8 +-
 locales/sv_SE/pcsx2_Iconized.po                    |    28 +-
 locales/sv_SE/pcsx2_Main.po                        |   401 +-
 locales/tr_TR/pcsx2_Iconized.po                    |    22 +-
 locales/tr_TR/pcsx2_Main.po                        |    40 +-
 nsis/SectionCoreReqs.nsh                           |   168 +-
 old_plugins.sln                                    |   280 +
 old_plugins_2013.sln                               |   893 -
 pcsx2/AsyncFileReader.h                            |    16 -
 pcsx2/CDVD/CDVD.cpp                                |     6 +-
 pcsx2/CDVD/ChunksCache.cpp                         |    52 +
 pcsx2/CDVD/ChunksCache.h                           |    63 +
 pcsx2/CDVD/CompressedFileReader.cpp                |   526 +-
 .../CompressedFileReader.h}                        |    21 +-
 pcsx2/CDVD/CompressedFileReaderUtils.h             |    44 +
 pcsx2/CDVD/CsoFileReader.cpp                       |   311 +
 pcsx2/CDVD/CsoFileReader.h                         |    98 +
 ...pressedFileReader.cpp => GzippedFileReader.cpp} |   292 +-
 pcsx2/CDVD/GzippedFileReader.h                     |    93 +
 pcsx2/CDVD/InputIsoFile.cpp                        |   712 +-
 pcsx2/CDVD/IsoFileFormats.h                        |     1 +
 pcsx2/CDVD/OutputIsoFile.cpp                       |   280 +-
 pcsx2/CDVD/zlib_indexed.h                          |    15 +-
 pcsx2/CMakeLists.txt                               |    63 +-
 pcsx2/COP0.cpp                                     |     1 +
 pcsx2/Config.h                                     |     1 +
 pcsx2/Counters.cpp                                 |    12 +-
 pcsx2/DebugTools/DisR5900asm.cpp                   |     6 +-
 pcsx2/Docs/GPL.txt                                 |  1346 +-
 pcsx2/Docs/License.txt                             |    38 +-
 pcsx2/GS.cpp                                       |     5 +-
 pcsx2/Gif_Logger.cpp                               |   174 +-
 pcsx2/Gif_Unit.cpp                                 |   354 +-
 pcsx2/Gif_Unit.h                                   |  1358 +-
 pcsx2/IopCounters.cpp                              |     5 +-
 pcsx2/MMI.cpp                                      |    28 +-
 pcsx2/MTGS.cpp                                     |    21 +-
 pcsx2/MTVU.cpp                                     |   716 +-
 pcsx2/MTVU.h                                       |   208 +-
 pcsx2/OutputIsoFile.cpp                            |   296 +-
 pcsx2/Patch.cpp                                    |    19 +-
 pcsx2/Patch.h                                      |     1 +
 pcsx2/Patch_Memory.cpp                             |   980 +-
 pcsx2/Pcsx2Config.cpp                              |     2 +
 pcsx2/PluginManager.cpp                            |    26 +-
 pcsx2/Plugins.h                                    |     2 +
 pcsx2/R5900.cpp                                    |     2 +-
 pcsx2/RDebug/deci2.txt                             |    54 +-
 pcsx2/RDebug/iloadp.txt                            |    64 +-
 pcsx2/SPR.cpp                                      |     2 +-
 pcsx2/SaveState.h                                  |     2 +-
 pcsx2/Sio.cpp                                      |    29 +
 pcsx2/Sio.h                                        |    13 +
 pcsx2/SysForwardDefs.h                             |     1 +
 pcsx2/System.cpp                                   |    11 +-
 pcsx2/Utilities/FileUtils.cpp                      |    70 +
 pcsx2/Utilities/folderdesc.txt                     |    12 +-
 pcsx2/Vif0_Dma.cpp                                 |     2 +-
 pcsx2/Vif1_Dma.cpp                                 |     2 +-
 pcsx2/Vif1_MFIFO.cpp                               |     2 +-
 pcsx2/Vif_Codes.cpp                                |     2 +-
 pcsx2/Vif_Dma.h                                    |     3 +
 pcsx2/Vif_Unpack.cpp                               |     7 +
 pcsx2/gui/AppConfig.cpp                            |     4 +-
 pcsx2/gui/AppConfig.h                              |     9 +
 pcsx2/gui/AppCoreThread.cpp                        |    51 +-
 pcsx2/gui/AppGameDatabase.cpp                      |     2 +-
 pcsx2/gui/AppMain.cpp                              |   166 +-
 pcsx2/gui/ConsoleLogger.cpp                        |    35 +-
 pcsx2/gui/ConsoleLogger.h                          |     4 +
 pcsx2/gui/Debugger/CtrlDisassemblyView.cpp         |     2 +-
 pcsx2/gui/Dialogs/BaseConfigurationDialog.cpp      |    21 +-
 pcsx2/gui/Dialogs/BiosSelectorDialog.cpp           |    76 -
 pcsx2/gui/Dialogs/ConfigurationDialog.h            |    48 +-
 pcsx2/gui/Dialogs/ConfirmationDialogs.cpp          |     3 +-
 pcsx2/gui/Dialogs/ConvertMemoryCardDialog.cpp      |   236 +
 pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp       |    42 +-
 pcsx2/gui/Dialogs/McdConfigDialog.cpp              |     9 +
 pcsx2/gui/FrameForGS.cpp                           |    28 +-
 pcsx2/gui/GSFrame.h                                |    10 +-
 pcsx2/gui/MSWstuff.cpp                             |    18 -
 pcsx2/gui/MainFrame.cpp                            |    24 +-
 pcsx2/gui/MainFrame.h                              |     1 +
 pcsx2/gui/MainMenuClicks.cpp                       |    10 +-
 pcsx2/gui/MemoryCardFile.cpp                       |   174 +-
 pcsx2/gui/MemoryCardFolder.cpp                     |  1556 +
 pcsx2/gui/MemoryCardFolder.h                       |   545 +
 pcsx2/gui/MessageBoxes.cpp                         |    22 +-
 pcsx2/gui/Panels/ConfigurationPanels.h             |     3 +-
 pcsx2/gui/Panels/CpuPanel.cpp                      |    15 +-
 pcsx2/gui/Panels/GameFixesPanel.cpp                |     4 +-
 pcsx2/gui/Panels/MemoryCardListPanel.cpp           |   143 +-
 pcsx2/gui/Panels/MemoryCardListView.cpp            |     2 +-
 pcsx2/gui/Panels/MemoryCardPanels.h                |     6 +
 pcsx2/gui/Panels/MiscPanelStuff.cpp                |     2 +-
 pcsx2/gui/Panels/PluginSelectorPanel.cpp           |    22 +-
 pcsx2/gui/Panels/SpeedhacksPanel.cpp               |   112 +-
 pcsx2/gui/Resources/BackgroundLogo.png             |   Bin 68730 -> 62621 bytes
 pcsx2/gui/i18n.cpp                                 |     9 +-
 pcsx2/gui/pxEventThread.h                          |     6 +-
 pcsx2/ps2/BiosTools.cpp                            |     2 +-
 pcsx2/windows/FlatFileReaderWindows.cpp            |   252 +-
 pcsx2/windows/SamplProf.cpp                        |     2 +-
 pcsx2/windows/VCprojects/pcsx2.vcxproj             |    92 +-
 pcsx2/windows/VCprojects/pcsx2.vcxproj.filters     |   110 +-
 pcsx2/windows/VCprojects/pcsx2_vs2012.vcxproj      |   945 -
 .../VCprojects/pcsx2_vs2012.vcxproj.filters        |  1360 -
 pcsx2/windows/VCprojects/pcsx2_vs2013.vcxproj      |   945 -
 .../VCprojects/pcsx2_vs2013.vcxproj.filters        |  1360 -
 pcsx2/windows/WinKeyCodes.cpp                      |   125 +
 pcsx2/x86/BaseblockEx.h                            |     5 +-
 pcsx2/x86/iCore.h                                  |    20 +-
 pcsx2/x86/iMMI.cpp                                 |    20 +-
 pcsx2/x86/ix86-32/iCore-32.cpp                     |     6 +-
 pcsx2/x86/ix86-32/iR5900-32.cpp                    |     6 +-
 pcsx2/x86/microVU_Analyze.inl                      |    26 +-
 pcsx2/x86/microVU_Branch.inl                       |    12 +-
 pcsx2/x86/microVU_Flags.inl                        |    20 +-
 pcsx2/x86/microVU_Log.inl                          |     4 +
 pcsx2/x86/microVU_Profiler.h                       |   286 +-
 pcsx2/x86/microVU_Upper.inl                        |    18 +-
 pcsx2/x86/newVif_Dynarec.cpp                       |    12 +-
 pcsx2/x86/newVif_Unpack.cpp                        |     2 +-
 pcsx2/x86/newVif_UnpackSSE.cpp                     |    14 +-
 pcsx2_suite_2012.sln                               |  1191 -
 pcsx2_suite_2013.sln                               |  1251 -
 plugins/CDVDnull/CDVD.h                            |     2 +-
 plugins/CDVDnull/CMakeLists.txt                    |    16 +-
 plugins/CDVDnull/ReadMe.txt                        |    78 +-
 plugins/CDVDnull/Windows/CDVDnull.def              |    58 +-
 plugins/CDVDnull/Windows/CDVDnull.vcxproj          |    30 +-
 plugins/CDVDnull/Windows/CDVDnull_vs2012.vcxproj   |    73 -
 .../Windows/CDVDnull_vs2012.vcxproj.filters        |    24 -
 plugins/CDVDnull/Windows/CDVDnull_vs2013.vcxproj   |    73 -
 .../Windows/CDVDnull_vs2013.vcxproj.filters        |    24 -
 plugins/CDVDnull/Windows/plugin.def                |    42 +-
 plugins/CMakeLists.txt                             |    76 +-
 plugins/FWnull/CMakeLists.txt                      |    16 +-
 plugins/FWnull/License.txt                         |   684 +-
 plugins/FWnull/ReadMe.txt                          |    68 +-
 plugins/FWnull/Windows/FWnull.vcxproj              |     4 +-
 plugins/FWnull/Windows/FWnull_vs2012.vcxproj       |    91 -
 .../FWnull/Windows/FWnull_vs2012.vcxproj.filters   |    38 -
 plugins/FWnull/Windows/FWnull_vs2013.vcxproj       |    91 -
 .../FWnull/Windows/FWnull_vs2013.vcxproj.filters   |    38 -
 plugins/FWnull/Windows/FireWireNull.def            |    42 +-
 plugins/GSdx/CMakeLists.txt                        |    59 +-
 plugins/GSdx/GLLoader.cpp                          |   315 +-
 plugins/GSdx/GLLoader.h                            |   131 +-
 plugins/GSdx/GLState.cpp                           |   106 +-
 plugins/GSdx/GLState.h                             |    23 +-
 plugins/GSdx/GPUSettingsDlg.cpp                    |     2 +-
 plugins/GSdx/GS.cpp                                |   418 +-
 plugins/GSdx/GS.h                                  |     3 +-
 plugins/GSdx/GSCapture.cpp                         |    58 +-
 plugins/GSdx/GSCapture.h                           |    17 +-
 plugins/GSdx/GSClut.cpp                            |    30 +-
 plugins/GSdx/GSClut.h                              |    12 +-
 plugins/GSdx/GSCrc.cpp                             |    98 +-
 plugins/GSdx/GSCrc.h                               |     4 +-
 plugins/GSdx/GSDevice.cpp                          |    65 +-
 plugins/GSdx/GSDevice.h                            |    38 +-
 plugins/GSdx/GSDevice11.cpp                        |   142 +-
 plugins/GSdx/GSDevice11.h                          |    21 +-
 plugins/GSdx/GSDevice9.cpp                         |   102 +-
 plugins/GSdx/GSDevice9.h                           |    20 +-
 plugins/GSdx/GSDeviceDX.h                          |     3 +-
 plugins/GSdx/GSDeviceNull.h                        |     4 +-
 plugins/GSdx/GSDeviceOGL.cpp                       |  1318 +-
 plugins/GSdx/GSDeviceOGL.h                         |   368 +-
 plugins/GSdx/GSDeviceSW.cpp                        |    74 +-
 plugins/GSdx/GSDeviceSW.h                          |    12 +-
 plugins/GSdx/GSDrawScanline.cpp                    |    10 +-
 .../GSdx/GSDrawScanlineCodeGenerator.x64.avx.cpp   |     4 +-
 .../GSdx/GSDrawScanlineCodeGenerator.x86.avx.cpp   |     4 +-
 .../GSdx/GSDrawScanlineCodeGenerator.x86.avx2.cpp  |  5936 +-
 plugins/GSdx/GSDrawingContext.cpp                  |   138 +
 plugins/GSdx/GSDrawingContext.h                    |   106 +
 plugins/GSdx/GSDrawingEnvironment.h                |   118 +
 plugins/GSdx/GSDump.cpp                            |     5 +-
 plugins/GSdx/GSDump.h                              |     1 +
 plugins/GSdx/GSLinuxDialog.cpp                     |   852 +-
 plugins/GSdx/GSLinuxLogo.h                         |  4227 +-
 plugins/GSdx/GSLocalMemory.cpp                     |   114 +-
 plugins/GSdx/GSLocalMemory.h                       |    57 +-
 plugins/GSdx/GSLzma.cpp                            |   156 +
 plugins/GSdx/GSLzma.h                              |    86 +
 plugins/GSdx/GSPerfMon.cpp                         |     8 +
 plugins/GSdx/GSPng.cpp                             |   175 +
 plugins/GSdx/GSPng.h                               |    66 +
 plugins/GSdx/GSRasterizer.cpp                      |    40 +-
 plugins/GSdx/GSRasterizer.h                        |    44 +-
 plugins/GSdx/GSRenderer.cpp                        |    19 +-
 plugins/GSdx/GSRenderer.h                          |     6 +-
 plugins/GSdx/GSRendererCL.cpp                      |   647 +-
 plugins/GSdx/GSRendererCL.h                        |    16 +-
 plugins/GSdx/GSRendererCS.cpp                      |    26 +-
 plugins/GSdx/GSRendererCS.h                        |     4 +-
 plugins/GSdx/GSRendererDX.cpp                      |   103 +-
 plugins/GSdx/GSRendererDX9.cpp                     |     9 +-
 plugins/GSdx/GSRendererHW.cpp                      |   451 +-
 plugins/GSdx/GSRendererHW.h                        |    17 +-
 plugins/GSdx/GSRendererOGL.cpp                     |   925 +-
 plugins/GSdx/GSRendererOGL.h                       |    42 +-
 plugins/GSdx/GSRendererSW.cpp                      |   129 +-
 plugins/GSdx/GSSetting.cpp                         |   114 +-
 plugins/GSdx/GSSetting.h                           |    34 +-
 plugins/GSdx/GSSettingsDlg.cpp                     |   200 +-
 plugins/GSdx/GSSettingsDlg.h                       |     7 +-
 plugins/GSdx/GSSetupPrimCodeGenerator.x86.avx2.cpp |   704 +-
 plugins/GSdx/GSShaderOGL.cpp                       |   213 +-
 plugins/GSdx/GSShaderOGL.h                         |    18 +-
 plugins/GSdx/GSState.cpp                           |   589 +-
 plugins/GSdx/GSState.h                             |    11 +-
 plugins/GSdx/GSTexture.h                           |     5 +
 plugins/GSdx/GSTextureCache.cpp                    |   644 +-
 plugins/GSdx/GSTextureCache.h                      |    31 +-
 plugins/GSdx/GSTextureCache11.cpp                  |    10 +-
 plugins/GSdx/GSTextureCache11.h                    |     2 +
 plugins/GSdx/GSTextureCache9.cpp                   |    10 +-
 plugins/GSdx/GSTextureCache9.h                     |     2 +
 plugins/GSdx/GSTextureCacheOGL.cpp                 |   105 +-
 plugins/GSdx/GSTextureCacheOGL.h                   |     4 +-
 plugins/GSdx/GSTextureCacheSW.cpp                  |    10 +-
 plugins/GSdx/GSTextureFX11.cpp                     |     6 +-
 plugins/GSdx/GSTextureFXOGL.cpp                    |   147 +-
 plugins/GSdx/GSTextureOGL.cpp                      |   426 +-
 plugins/GSdx/GSTextureOGL.h                        |    27 +-
 plugins/GSdx/GSTextureSW.cpp                       |    13 +
 plugins/GSdx/GSThread.cpp                          |    22 +-
 plugins/GSdx/GSThread.h                            |    91 +-
 plugins/GSdx/GSThread_CXX11.h                      |   342 +
 plugins/GSdx/GSUniformBufferOGL.h                  |    85 +-
 plugins/GSdx/GSUtil.cpp                            |     4 +-
 plugins/GSdx/GSVector.cpp                          |     4 +
 plugins/GSdx/GSVector.h                            |    13 +
 plugins/GSdx/GSVertexArrayOGL.h                    |   234 +-
 plugins/GSdx/GSWnd.cpp                             |    29 +-
 plugins/GSdx/GSWndEGL.cpp                          |    30 +-
 plugins/GSdx/GSWndEGL.h                            |    21 +-
 plugins/GSdx/GSWndOGL.cpp                          |     2 +-
 plugins/GSdx/GSWndOGL.h                            |     2 +-
 plugins/GSdx/GSWndWGL.cpp                          |   137 +-
 plugins/GSdx/GSWndWGL.h                            |     4 +-
 plugins/GSdx/GSdx.cpp                              |    27 +-
 plugins/GSdx/GSdx.def                              |     5 +-
 plugins/GSdx/GSdx.h                                |     5 +
 plugins/GSdx/GSdx.props                            |    46 +-
 plugins/GSdx/GSdx.vcxproj                          |  3817 +-
 plugins/GSdx/GSdx.vcxproj.filters                  |  1515 +-
 plugins/GSdx/GSdx_vs2012.vcxproj                   |  2075 -
 plugins/GSdx/GSdx_vs2012.vcxproj.filters           |   752 -
 plugins/GSdx/GSdx_vs2013.vcxproj                   |  2088 -
 plugins/GSdx/GSdx_vs2013.vcxproj.filters           |   761 -
 plugins/GSdx/boost_spsc_queue.hpp                  |   177 +
 plugins/GSdx/config.h                              |    13 +-
 plugins/GSdx/linux_replay.cpp                      |    53 +-
 plugins/GSdx/res/convert.glsl                      |   224 -
 plugins/GSdx/res/fxaa.fx                           |     4 -
 plugins/GSdx/res/glsl/convert.glsl                 |   388 +
 plugins/GSdx/res/glsl/fxaa.fx                      |     1 +
 plugins/GSdx/res/{ => glsl}/interlace.glsl         |     4 -
 plugins/GSdx/res/{ => glsl}/merge.glsl             |     8 +-
 plugins/GSdx/res/{ => glsl}/shadeboost.glsl        |     7 +-
 plugins/GSdx/res/glsl/tfx_fs.glsl                  |   595 +
 plugins/GSdx/res/glsl/tfx_vgs.glsl                 |   250 +
 plugins/GSdx/res/glsl_source.h                     |  1439 +-
 plugins/GSdx/res/logo-ogl.bmp                      |   Bin 74462 -> 56004 bytes
 plugins/GSdx/res/tfx.cl                            |   163 +-
 plugins/GSdx/res/tfx.fx                            |    34 +
 plugins/GSdx/res/tfx.glsl                          |  1072 -
 plugins/GSdx/stdafx.cpp                            |    17 +-
 plugins/GSdx/stdafx.h                              |    93 +-
 plugins/GSdx/targetver.h                           |   112 +-
 plugins/GSdx/vsprops/ProjectRootDir.props          |    50 +-
 plugins/GSdx/vsprops/avx_vs10.props                |    38 +-
 plugins/GSdx/vsprops/avx_vs2013.props              |    38 +-
 plugins/GSdx/vsprops/common.props                  |    68 +-
 plugins/GSdx/vsprops/debug.props                   |    30 +-
 plugins/GSdx/vsprops/release.props                 |    50 +-
 plugins/GSdx/vsprops/sse2.props                    |    38 +-
 plugins/GSdx/vsprops/sse4.props                    |    38 +-
 plugins/GSdx/vsprops/ssse3.props                   |    40 +-
 plugins/GSdx/work_to_use_gpu_buffer_directly.patch |    99 -
 plugins/GSdx/xbyak/xbyak.h                         |  1261 +-
 plugins/GSdx/xbyak/xbyak_mnemonic.h                |   461 +-
 plugins/GSdx/xbyak/xbyak_util.h                    |   144 +-
 plugins/GSnull/CMakeLists.txt                      |    16 +-
 plugins/GSnull/GS.h                                |     2 +-
 plugins/GSnull/Windows/GSnull.vcxproj              |     4 +-
 plugins/GSnull/Windows/GSnull.vcxproj.filters      |     3 +
 plugins/GSnull/Windows/GSnull_vc2008.sln           |    40 +-
 plugins/GSnull/Windows/GSnull_vs2012.vcxproj       |   109 -
 .../GSnull/Windows/GSnull_vs2012.vcxproj.filters   |    75 -
 plugins/GSnull/Windows/GSnull_vs2013.vcxproj       |   109 -
 .../GSnull/Windows/GSnull_vs2013.vcxproj.filters   |    78 -
 plugins/LilyPad/CMakeLists.txt                     |    66 +
 plugins/LilyPad/Config.cpp                         |     1 +
 plugins/LilyPad/Config.h                           |     4 +-
 plugins/LilyPad/DeviceEnumerator.cpp               |    10 +
 plugins/LilyPad/Global.h                           |    85 +-
 plugins/LilyPad/InputManager.cpp                   |     6 +
 plugins/LilyPad/InputManager.h                     |    11 +
 plugins/LilyPad/KeyboardQueue.cpp                  |    18 +
 plugins/LilyPad/KeyboardQueue.h                    |     6 +
 plugins/LilyPad/LilyPad.cpp                        |    76 +-
 plugins/LilyPad/LilyPad.def                        |    50 +-
 plugins/LilyPad/LilyPad.vcxproj                    |    13 +-
 plugins/LilyPad/LilyPad_vs2012.vcxproj             |   509 -
 plugins/LilyPad/LilyPad_vs2012.vcxproj.filters     |   151 -
 plugins/LilyPad/LilyPad_vs2013.vcxproj             |   509 -
 plugins/LilyPad/LilyPad_vs2013.vcxproj.filters     |   151 -
 plugins/LilyPad/Linux/Config.cpp                   |   514 +
 plugins/LilyPad/Linux/ConfigHelper.cpp             |   112 +
 plugins/LilyPad/Linux/ConfigHelper.h               |    48 +
 plugins/LilyPad/Linux/JoyEvdev.cpp                 |   208 +
 plugins/LilyPad/Linux/JoyEvdev.h                   |    77 +
 plugins/LilyPad/Linux/KeyboardMouse.cpp            |    78 +
 .../{KeyboardQueue.h => Linux/KeyboardMouse.h}     |    19 +-
 plugins/LilyPad/Linux/KeyboardQueue.cpp            |    61 +
 plugins/LilyPad/Linux/bitmaskros.h                 |    40 +
 plugins/PadNull/CMakeLists.txt                     |    16 +-
 plugins/PadNull/Pad.h                              |     2 +-
 plugins/PadNull/Windows/PadNull.vcxproj            |     4 +-
 plugins/PadNull/Windows/PadNull_vs2012.vcxproj     |   108 -
 .../PadNull/Windows/PadNull_vs2012.vcxproj.filters |    52 -
 plugins/PadNull/Windows/PadNull_vs2013.vcxproj     |   108 -
 .../PadNull/Windows/PadNull_vs2013.vcxproj.filters |    52 -
 plugins/SPU2null/CMakeLists.txt                    |    16 +-
 plugins/SPU2null/Changelog.txt                     |    60 +-
 plugins/SPU2null/ReadMe.txt                        |    78 +-
 plugins/SPU2null/SPU2.h                            |     2 +-
 plugins/SPU2null/Windows/SPU2null.def              |    60 +-
 plugins/USBnull/CMakeLists.txt                     |    16 +-
 plugins/USBnull/ReadMe.txt                         |    68 +-
 plugins/USBnull/Windows/USBnull.def                |    58 +-
 plugins/USBnull/Windows/USBnull.vcxproj            |     4 +-
 plugins/USBnull/Windows/USBnull_vs2012.vcxproj     |    91 -
 .../USBnull/Windows/USBnull_vs2012.vcxproj.filters |    38 -
 plugins/USBnull/Windows/USBnull_vs2013.vcxproj     |    91 -
 .../USBnull/Windows/USBnull_vs2013.vcxproj.filters |    38 -
 .../cdvdGigaherz/src/Windows/cdvdGigaherz.vcxproj  |     4 +-
 .../src/Windows/cdvdGigaherz_vs2012.vcxproj        |   134 -
 .../Windows/cdvdGigaherz_vs2012.vcxproj.filters    |    88 -
 .../src/Windows/cdvdGigaherz_vs2013.vcxproj        |   134 -
 .../Windows/cdvdGigaherz_vs2013.vcxproj.filters    |    88 -
 plugins/dev9null/CMakeLists.txt                    |    16 +-
 plugins/dev9null/ReadMe.txt                        |    64 +-
 plugins/dev9null/Windows/DEV9null.vcxproj          |     4 +-
 plugins/dev9null/Windows/DEV9null_vs2012.vcxproj   |   102 -
 .../Windows/DEV9null_vs2012.vcxproj.filters        |    26 -
 plugins/dev9null/Windows/DEV9null_vs2013.vcxproj   |   102 -
 .../Windows/DEV9null_vs2013.vcxproj.filters        |    26 -
 plugins/dev9null/Windows/dev9null.def              |    70 +-
 plugins/onepad/CMakeLists.txt                      |    16 +-
 plugins/onepad/joystick.cpp                        |     8 +-
 plugins/onepad/onepad.cpp                          |    10 +-
 plugins/onepad/onepad.h                            |     4 +-
 plugins/spu2-x/GPL.txt                             |  1346 +-
 plugins/spu2-x/LGPL.txt                            |   328 +-
 plugins/spu2-x/License.txt                         |    40 +-
 plugins/spu2-x/Website.txt                         |    36 +-
 plugins/spu2-x/src/CMakeLists.txt                  |    16 +-
 plugins/spu2-x/src/DplIIdecoder.cpp                |   348 +-
 plugins/spu2-x/src/PS2E-spu2.h                     |     2 +-
 plugins/spu2-x/src/SndOut_Portaudio.cpp            |    10 +-
 plugins/spu2-x/src/Windows/Dialogs.h               |     2 +-
 plugins/spu2-x/src/Windows/SndOut_DSound.cpp       |    12 +-
 plugins/spu2-x/src/Windows/Spu2-X.def              |   130 +-
 plugins/spu2-x/src/Windows/Spu2-X.vcxproj          |    39 +-
 plugins/spu2-x/src/Windows/Spu2-X_vs2012.vcxproj   |   500 -
 .../src/Windows/Spu2-X_vs2012.vcxproj.filters      |   248 -
 plugins/spu2-x/src/Windows/Spu2-X_vs2013.vcxproj   |   500 -
 .../src/Windows/Spu2-X_vs2013.vcxproj.filters      |   248 -
 plugins/spu2-x/src/Windows/UIHelpers.cpp           |    47 +-
 plugins/zzogl-pg/opengl/CMakeLists.txt             |     8 +-
 plugins/zzogl-pg/opengl/GS.h                       |     2 +-
 plugins/zzogl-pg/opengl/Win32/Conf.cpp             |    27 +-
 plugins/zzogl-pg/opengl/Win32/zerogsogl.vcxproj    |    38 +-
 .../opengl/Win32/zerogsogl.vcxproj.filters         |     2 +-
 plugins/zzogl-pg/opengl/Win32/zerogsogl_2008.sln   |    84 +-
 .../zzogl-pg/opengl/Win32/zerogsogl_vs2012.vcxproj |   294 -
 .../opengl/Win32/zerogsogl_vs2012.vcxproj.filters  |   241 -
 .../zzogl-pg/opengl/Win32/zerogsogl_vs2013.vcxproj |   294 -
 .../opengl/Win32/zerogsogl_vs2013.vcxproj.filters  |   241 -
 .../zzogl-pg/opengl/ZeroGSShaders/CMakeLists.txt   |     8 +-
 plugins/zzogl-pg/opengl/ps2hw.glsl                 |  1654 +-
 475 files changed, 64332 insertions(+), 77070 deletions(-)

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



More information about the Pkg-games-commits mailing list