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

..

arm

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

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

file_sys

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

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

frontend

Merge pull request #2899 from wwylele/touch-refactor

2017-08-29 11:29:10 -04:00

gdbstub

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

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

hle

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

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

hw

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

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

loader

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

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

tracer

Core: Fix some out-of-style includes

2017-05-27 16:31:42 -07:00

3ds.h

Move screen size constants from video_core to core

2017-05-27 18:41:24 -07:00

CMakeLists.txt

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

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

core_timing.cpp

Moved down_count to CoreTiming

2017-09-30 17:38:14 +01:00

core_timing.h

Moved down_count to CoreTiming

2017-09-30 17:38:14 +01:00

core.cpp

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

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

core.h

core: Expose AppLoader as a public interface.

2017-08-03 20:10:37 -04:00

memory_setup.h

core: Various changes to support 64-bit addressing.

2017-09-30 14:28:54 -04:00

memory.cpp

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

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

memory.h

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

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

mmio.h

Remove empty newlines in #include blocks.

2016-09-21 11:15:47 +09:00

perf_stats.cpp

PerfStats: Re-order and document members better

2017-02-26 17:22:04 -08:00

perf_stats.h

PerfStats: Re-order and document members better

2017-02-26 17:22:04 -08:00

settings.cpp

SidebySide Layout (#2859)

2017-08-25 17:53:07 -04:00

settings.h

WebService: Verify username and token (#2930)

2017-09-18 21:18:26 -04:00

telemetry_session.cpp

WebService: Verify username and token (#2930)

2017-09-18 21:18:26 -04:00

telemetry_session.h

WebService: Verify username and token (#2930)

2017-09-18 21:18:26 -04:00