Merge remote-tracking branch 'upstream/master' into nx

Browse Source

# 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

...

This commit is contained in:

bunnei

2017-10-09 23:56:20 -04:00

parent e36ccd5ff1 3f36ddc28f

commit 775cf60729

241 changed files with 20955 additions and 2730 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

externals/enet

Vendored

+1 -1

Submodule externals/enet updated: a84c120eff...9d9ba122d4