Merge 5cbd2d2563 into 9ae55884d2

Add files via upload
Fix gdbstub typo, fixes Citra #3318
2018-01-17 14:14:54 +00:00 · 2018-01-17 08:47:38 -05:00 · 2018-01-17 08:38:44 -05:00 · 2018-01-16 16:16:37 -05:00 · 2018-01-16 16:16:16 -05:00 · 2018-01-16 15:49:20 -05:00
2 changed files with 1038 additions and 1038 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -266,7 +266,7 @@ endif()
 if (ENABLE_QT)
    if (YUZU_USE_BUNDLED_QT)
        if (MSVC14 AND ARCHITECTURE_x86_64)
-            set(QT_VER qt-5.7-msvc2015_64)
+            set(QT_VER qt-5.10.0-msvc2015_64)
        else()
            message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.")
        endif()
--- a/src/core/gdbstub/gdbstub.cpp
+++ b/src/core/gdbstub/gdbstub.cpp
Author	SHA1	Message	Date
River City Ransomware	7eb19e8b89	Merge `5cbd2d2563` into `9ae55884d2`	2018-01-17 14:14:54 +00:00
River City Ransomware	5cbd2d2563	Add files via upload	2018-01-17 08:47:38 -05:00
River City Ransomware	b674060c18	Fix gdbstub typo, fixes Citra #3318	2018-01-17 08:38:44 -05:00
River City Ransomware	b491f67cff	Merge remote-tracking branch 'origin/master'	2018-01-16 16:16:37 -05:00
River City Ransomware	05803ac828	Updates CMakeLists to use Qt 5.10.0 instead of Qt 5.7	2018-01-16 16:16:16 -05:00
River City Ransomware	54872cfb25	Updates CMakeLists to use Qt 5.10.0 instead of Qt 5.7	2018-01-16 15:49:20 -05:00