# 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

travis: Split build scripts for different platforms

Change command header in nwm::UDS Initialize function

Remove more usages of GetPointer.

This commit also separates clang-format from the linux build, closing #2702.

file_sys/archive_ncch: use NCCHs/.apps instead of .romfs files, NCCH section override

HLE/APT: Always set up the APT parameter when starting a library applet.

Extracted the attribute setup and draw commands into their own functions

SharedMemory: Don't take over and unmap the source memory block when creating a shared memory, just reference it

macOS: Build x86_64h slice