bunnei b1d5db1cf6 Merge remote-tracking branch 'upstream/master' into nx ... # Conflicts: # src/core/CMakeLists.txt # src/core/arm/dynarmic/arm_dynarmic.cpp # src/core/arm/dyncom/arm_dyncom.cpp # src/core/hle/kernel/process.cpp # src/core/hle/kernel/thread.cpp # src/core/hle/kernel/thread.h # src/core/hle/kernel/vm_manager.cpp # src/core/loader/3dsx.cpp # src/core/loader/elf.cpp # src/core/loader/ncch.cpp # src/core/memory.cpp # src/core/memory.h # src/core/memory_setup.h		2017-10-09 23:56:20 -04:00
..
audio_core	Fixed type conversion ambiguity	2017-09-30 09:34:35 +01:00
citra	WebService: Verify username and token (#2930)	2017-09-18 21:18:26 -04:00
citra_qt	Fixed type conversion ambiguity	2017-09-30 09:34:35 +01:00
common	Merge remote-tracking branch 'upstream/master' into nx	2017-10-09 23:56:20 -04:00
core	Merge remote-tracking branch 'upstream/master' into nx	2017-10-09 23:56:20 -04:00
input_common	motion_emu: fix initialization order	2017-08-22 11:43:44 +03:00
network	Fixed type conversion ambiguity	2017-09-30 09:34:35 +01:00
tests	Merge remote-tracking branch 'upstream/master' into nx	2017-10-09 23:56:20 -04:00
video_core	Extracted the attribute setup and draw commands into their own functions	2017-10-04 01:08:29 +01:00
web_service	WebService: Verify username and token (#2930)	2017-09-18 21:18:26 -04:00
.clang-format	Remove special rules for Windows.h and library includes	2016-09-21 00:16:33 -07:00
CMakeLists.txt	web_service: Add CMake flag to enable.	2017-07-11 18:33:41 -04:00