You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		8 years ago
..
boost@3abc84abaf	Externals: Upgrade bundled Boost to 1.64	8 years ago
catch@3dcc923351	externals: Update catch to 1.9.4	8 years ago
cmake-modules	Fixes SDL2.dll copy to bindir on windows	9 years ago
cpr@b5758fbc88	externals: Add CPR as a submodule.	8 years ago
cryptopp	Update cryptopp	8 years ago
dynarmic@69eccf826d	Merge remote-tracking branch 'upstream/master' into nx	8 years ago
enet@9d9ba122d4	Merge remote-tracking branch 'upstream/master' into nx	8 years ago
fmt@ac5484c4e7	Add the fmt string formatting library	8 years ago
getopt	getopt: Fix macro redefinition warning	10 years ago
glad	CMake: Stop using FindOpenGL, which seems to not be required anymore	8 years ago
inih	CMake: Use target properties to add inih include paths	8 years ago
json	Add description of upstream repo	8 years ago
lz4@c10863b98e	externals: Add lz4.	8 years ago
microprofile	Fix Microprofile in MinGW (#2530)	8 years ago
nihstro@7e24743af2	externals: nihstro, update to latest master	8 years ago
soundtouch@019d2089bb	externals: Update soundtouch	8 years ago
xbyak@fe4765d2fe	Externals: Add Xbyak	9 years ago
CMakeLists.txt	Merge remote-tracking branch 'upstream/master' into nx	8 years ago