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
..
boost@3abc84abaf	Externals: Upgrade bundled Boost to 1.64	2017-06-11 13:10:22 -07:00
catch@3dcc923351	externals: Update catch to 1.9.4	2017-05-21 19:29:21 -04:00
cmake-modules	Fixes SDL2.dll copy to bindir on windows	2016-07-21 10:28:52 +02:00
cpr@b5758fbc88	externals: Add CPR as a submodule.	2017-07-09 13:24:20 -04:00
cryptopp	Update cryptopp	2017-08-08 17:50:09 +10:00
dynarmic@69eccf826d	Merge remote-tracking branch 'upstream/master' into nx	2017-10-09 23:56:20 -04:00
enet@9d9ba122d4	Merge remote-tracking branch 'upstream/master' into nx	2017-10-09 23:56:20 -04:00
fmt@ac5484c4e7	Add the fmt string formatting library	2017-05-27 14:26:02 -07:00
getopt	getopt: Fix macro redefinition warning	2015-07-13 19:47:08 -03:00
glad	CMake: Stop using FindOpenGL, which seems to not be required anymore	2017-05-27 20:48:00 -07:00
inih	CMake: Use target properties to add inih include paths	2017-05-27 21:59:02 -07:00
json	Add description of upstream repo	2017-07-18 19:59:08 +10:00
lz4@c10863b98e	externals: Add lz4.	2017-09-30 14:30:04 -04:00
microprofile	Fix Microprofile in MinGW (#2530)	2017-02-04 15:36:38 -08:00
nihstro@7e24743af2	externals: nihstro, update to latest master	2017-02-06 12:00:45 +01:00
soundtouch@019d2089bb	externals: Update soundtouch	2017-08-20 17:30:05 -07:00
xbyak@fe4765d2fe	Externals: Add Xbyak	2016-12-14 20:06:08 -08:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/master' into nx	2017-10-09 23:56:20 -04:00