[dolphin-emu] 02/03: Merge tag 'upstream/5.0_rc33+dfsg' into experimental

[James Cowgill]

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

jcowgill-guest pushed a commit to branch experimental
in repository dolphin-emu.

commit 3264edad1f88ed7db6b28c3e3cf083616f2e73cd
Merge: c26d0fb 03c1ca6
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Thu Oct 1 11:48:00 2015 +0100

    Merge tag 'upstream/5.0_rc33+dfsg' into experimental
    
    Upstream version 5.0~rc33+dfsg
    
    # gpg: Signature made Thu 01 Oct 2015 11:47:56 BST using RSA key ID EA2D01EF
    # gpg: Good signature from "James Cowgill <james410 at cowgill.org.uk>"
    # gpg:                 aka "James Cowgill <jc1311 at york.ac.uk>"
    # gpg:                 aka "James Cowgill (Imagination Technologies) <James.Cowgill at imgtec.com>"

 Data/Sys/GameSettings/FB2.ini                     |  29 ++++
 Data/Sys/GameSettings/FFY.ini                     |  29 ++++
 Data/Sys/Themes/Boomy/README.txt                  |   1 -
 Data/Sys/Themes/Boomy/audio.png                   | Bin 1877 -> 0 bytes
 Data/Sys/Themes/Boomy/browse.png                  | Bin 1708 -> 0 bytes
 Data/Sys/Themes/Boomy/classic.png                 | Bin 1616 -> 0 bytes
 Data/Sys/Themes/Boomy/config.png                  | Bin 1735 -> 0 bytes
 Data/Sys/Themes/Boomy/fullscreen.png              | Bin 1387 -> 0 bytes
 Data/Sys/Themes/Boomy/gcpad.png                   | Bin 1604 -> 0 bytes
 Data/Sys/Themes/Boomy/graphics.png                | Bin 1800 -> 0 bytes
 Data/Sys/Themes/Boomy/help.png                    | Bin 1808 -> 0 bytes
 Data/Sys/Themes/Boomy/nobanner.png                | Bin 321 -> 0 bytes
 Data/Sys/Themes/Boomy/open.png                    | Bin 1493 -> 0 bytes
 Data/Sys/Themes/Boomy/pause.png                   | Bin 1750 -> 0 bytes
 Data/Sys/Themes/Boomy/play.png                    | Bin 1743 -> 0 bytes
 Data/Sys/Themes/Boomy/refresh.png                 | Bin 1761 -> 0 bytes
 Data/Sys/Themes/Boomy/screenshot.png              | Bin 1387 -> 0 bytes
 Data/Sys/Themes/Boomy/stop.png                    | Bin 1677 -> 0 bytes
 Data/Sys/Themes/Boomy/toolbar_add_breakpoint.png  | Bin 3647 -> 0 bytes
 Data/Sys/Themes/Boomy/toolbar_add_memorycheck.png | Bin 2842 -> 0 bytes
 Data/Sys/Themes/Boomy/toolbar_debugger_delete.png | Bin 2904 -> 0 bytes
 Data/Sys/Themes/Boomy/wiimote.png                 | Bin 1616 -> 0 bytes
 Source/Core/Common/CodeBlock.h                    |   4 +-
 Source/Core/DiscIO/Volume.h                       |   2 +-
 Source/Core/DiscIO/VolumeDirectory.cpp            |   2 +-
 Source/Core/DiscIO/VolumeDirectory.h              |   2 +-
 Source/Core/DiscIO/VolumeGC.cpp                   |   2 +-
 Source/Core/DiscIO/VolumeGC.h                     |   2 +-
 Source/Core/DiscIO/VolumeWad.h                    |   2 +-
 Source/Core/DiscIO/VolumeWiiCrypted.cpp           |   4 +-
 Source/Core/DiscIO/VolumeWiiCrypted.h             |   2 +-
 Source/Core/DolphinWX/ISOProperties.cpp           |   4 +-
 Source/Core/DolphinWX/TASInputDlg.cpp             | 156 +++++++++++++---------
 Source/Core/DolphinWX/TASInputDlg.h               |   8 +-
 Source/Core/VideoBackends/OGL/GLInterface/AGL.cpp |   4 +-
 Source/Core/VideoBackends/OGL/GLInterface/AGL.h   |   2 +-
 Source/Core/VideoBackends/OGL/GLInterface/EGL.cpp |   2 +-
 Source/Core/VideoBackends/OGL/GLInterface/EGL.h   |   2 +-
 Source/Core/VideoBackends/OGL/GLInterface/GLX.cpp |  15 ++-
 Source/Core/VideoBackends/OGL/GLInterface/GLX.h   |   2 +-
 Source/Core/VideoBackends/OGL/GLInterface/WGL.cpp |   2 +-
 Source/Core/VideoBackends/OGL/GLInterface/WGL.h   |   2 +-
 Source/Core/VideoBackends/OGL/GLInterfaceBase.h   |   2 +-
 Source/Core/VideoBackends/Software/SWmain.cpp     |   2 +-
 Source/Core/VideoCommon/VertexLoaderX64.cpp       |   2 +-
 45 files changed, 193 insertions(+), 93 deletions(-)

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