Correct conflict

2018-06-11 03:20:32 +02:00 · 2018-06-11 03:20:32 +02:00 · a3f466e62b
commit a3f466e62b
parent 6450b92d70
236 changed files with 1757 additions and 1757 deletions
--- a/Ryujinx.Core/Gpu/BlockLinearSwizzle.cs
+++ b/Ryujinx.Core/Gpu/BlockLinearSwizzle.cs
--- a/Ryujinx.Core/Gpu/INvGpuEngine.cs
+++ b/Ryujinx.Core/Gpu/INvGpuEngine.cs
--- a/Ryujinx.Core/Gpu/ISwizzle.cs
+++ b/Ryujinx.Core/Gpu/ISwizzle.cs
--- a/Ryujinx.Core/Gpu/LinearSwizzle.cs
+++ b/Ryujinx.Core/Gpu/LinearSwizzle.cs
--- a/Ryujinx.Core/Gpu/MacroInterpreter.cs
+++ b/Ryujinx.Core/Gpu/MacroInterpreter.cs
--- a/Ryujinx.Core/Gpu/NvGpu.cs
+++ b/Ryujinx.Core/Gpu/NvGpu.cs
--- a/Ryujinx.Core/Gpu/NvGpuBufferType.cs
+++ b/Ryujinx.Core/Gpu/NvGpuBufferType.cs
--- a/Ryujinx.Core/Gpu/NvGpuEngine.cs
+++ b/Ryujinx.Core/Gpu/NvGpuEngine.cs
--- a/Ryujinx.Core/Gpu/NvGpuEngine2d.cs
+++ b/Ryujinx.Core/Gpu/NvGpuEngine2d.cs
--- a/Ryujinx.Core/Gpu/NvGpuEngine2dReg.cs
+++ b/Ryujinx.Core/Gpu/NvGpuEngine2dReg.cs
--- a/Ryujinx.Core/Gpu/NvGpuEngine3d.cs
+++ b/Ryujinx.Core/Gpu/NvGpuEngine3d.cs
--- a/Ryujinx.Core/Gpu/NvGpuEngine3dReg.cs
+++ b/Ryujinx.Core/Gpu/NvGpuEngine3dReg.cs
--- a/Ryujinx.Core/Gpu/NvGpuFifo.cs
+++ b/Ryujinx.Core/Gpu/NvGpuFifo.cs
--- a/Ryujinx.Core/Gpu/NvGpuFifoMeth.cs
+++ b/Ryujinx.Core/Gpu/NvGpuFifoMeth.cs
--- a/Ryujinx.Core/Gpu/NvGpuMethod.cs
+++ b/Ryujinx.Core/Gpu/NvGpuMethod.cs
--- a/Ryujinx.Core/Gpu/NvGpuPBEntry.cs
+++ b/Ryujinx.Core/Gpu/NvGpuPBEntry.cs
--- a/Ryujinx.Core/Gpu/NvGpuPushBuffer.cs
+++ b/Ryujinx.Core/Gpu/NvGpuPushBuffer.cs
--- a/Ryujinx.Core/Gpu/NvGpuVmm.cs
+++ b/Ryujinx.Core/Gpu/NvGpuVmm.cs
--- a/Ryujinx.Core/Gpu/NvGpuVmmCache.cs
+++ b/Ryujinx.Core/Gpu/NvGpuVmmCache.cs
--- a/Ryujinx.Core/Gpu/Texture.cs
+++ b/Ryujinx.Core/Gpu/Texture.cs
--- a/Ryujinx.Core/Gpu/TextureFactory.cs
+++ b/Ryujinx.Core/Gpu/TextureFactory.cs
--- a/Ryujinx.Core/Gpu/TextureHelper.cs
+++ b/Ryujinx.Core/Gpu/TextureHelper.cs
--- a/Ryujinx.Core/Gpu/TextureReader.cs
+++ b/Ryujinx.Core/Gpu/TextureReader.cs
--- a/Ryujinx.Core/Gpu/TextureSwizzle.cs
+++ b/Ryujinx.Core/Gpu/TextureSwizzle.cs
--- a/Ryujinx.Core/Gpu/TextureWriter.cs
+++ b/Ryujinx.Core/Gpu/TextureWriter.cs
--- a/Ryujinx.Core/Hid/Hid.cs
+++ b/Ryujinx.Core/Hid/Hid.cs
--- a/Ryujinx.Core/Hid/HidControllerButtons.cs
+++ b/Ryujinx.Core/Hid/HidControllerButtons.cs
--- a/Ryujinx.Core/Hid/HidControllerColorDesc.cs
+++ b/Ryujinx.Core/Hid/HidControllerColorDesc.cs
--- a/Ryujinx.Core/Hid/HidControllerConnState.cs
+++ b/Ryujinx.Core/Hid/HidControllerConnState.cs
--- a/Ryujinx.Core/Hid/HidControllerId.cs
+++ b/Ryujinx.Core/Hid/HidControllerId.cs
--- a/Ryujinx.Core/Hid/HidControllerLayouts.cs
+++ b/Ryujinx.Core/Hid/HidControllerLayouts.cs
--- a/Ryujinx.Core/Hid/HidControllerType.cs
+++ b/Ryujinx.Core/Hid/HidControllerType.cs
--- a/Ryujinx.Core/Hid/HidJoystickPosition.cs
+++ b/Ryujinx.Core/Hid/HidJoystickPosition.cs
--- a/Ryujinx.Core/Hid/HidTouchPoint.cs
+++ b/Ryujinx.Core/Hid/HidTouchPoint.cs
--- a/Ryujinx.Core/Hid/JoyCon.cs
+++ b/Ryujinx.Core/Hid/JoyCon.cs
--- a/Ryujinx.Core/Hid/JoyConColor.cs
+++ b/Ryujinx.Core/Hid/JoyConColor.cs
--- a/Ryujinx.Core/Loaders/Compression/Lz4.cs
+++ b/Ryujinx.Core/Loaders/Compression/Lz4.cs
--- a/Ryujinx.Core/Loaders/ElfDyn.cs
+++ b/Ryujinx.Core/Loaders/ElfDyn.cs
--- a/Ryujinx.Core/Loaders/ElfDynTag.cs
+++ b/Ryujinx.Core/Loaders/ElfDynTag.cs
--- a/Ryujinx.Core/Loaders/ElfRel.cs
+++ b/Ryujinx.Core/Loaders/ElfRel.cs
--- a/Ryujinx.Core/Loaders/ElfRelType.cs
+++ b/Ryujinx.Core/Loaders/ElfRelType.cs
--- a/Ryujinx.Core/Loaders/ElfSym.cs
+++ b/Ryujinx.Core/Loaders/ElfSym.cs
--- a/Ryujinx.Core/Loaders/ElfSymBinding.cs
+++ b/Ryujinx.Core/Loaders/ElfSymBinding.cs
--- a/Ryujinx.Core/Loaders/ElfSymType.cs
+++ b/Ryujinx.Core/Loaders/ElfSymType.cs
--- a/Ryujinx.Core/Loaders/ElfSymVisibility.cs
+++ b/Ryujinx.Core/Loaders/ElfSymVisibility.cs
--- a/Ryujinx.Core/Loaders/Executable.cs
+++ b/Ryujinx.Core/Loaders/Executable.cs
--- a/Ryujinx.Core/Loaders/Executables/IExecutable.cs
+++ b/Ryujinx.Core/Loaders/Executables/IExecutable.cs
--- a/Ryujinx.Core/Loaders/Executables/Nro.cs
+++ b/Ryujinx.Core/Loaders/Executables/Nro.cs
--- a/Ryujinx.Core/Loaders/Executables/Nso.cs
+++ b/Ryujinx.Core/Loaders/Executables/Nso.cs
--- a/Ryujinx.Core/Logging/LogClass.cs
+++ b/Ryujinx.Core/Logging/LogClass.cs
--- a/Ryujinx.Core/Logging/LogEventArgs.cs
+++ b/Ryujinx.Core/Logging/LogEventArgs.cs
--- a/Ryujinx.Core/Logging/LogLevel.cs
+++ b/Ryujinx.Core/Logging/LogLevel.cs
--- a/Ryujinx.Core/Logging/Logger.cs
+++ b/Ryujinx.Core/Logging/Logger.cs
--- a/Ryujinx.Core/OsHle/AppletStateMgr.cs
+++ b/Ryujinx.Core/OsHle/AppletStateMgr.cs
--- a/Ryujinx.Core/OsHle/Diagnostics/Demangler.cs
+++ b/Ryujinx.Core/OsHle/Diagnostics/Demangler.cs
--- a/Ryujinx.Core/OsHle/ErrorCode.cs
+++ b/Ryujinx.Core/OsHle/ErrorCode.cs
--- a/Ryujinx.Core/OsHle/ErrorModule.cs
+++ b/Ryujinx.Core/OsHle/ErrorModule.cs
--- a/Ryujinx.Core/OsHle/Exceptions/GuestBrokeExecutionException.cs
+++ b/Ryujinx.Core/OsHle/Exceptions/GuestBrokeExecutionException.cs
--- a/Ryujinx.Core/OsHle/Exceptions/UndefinedInstructionException.cs
+++ b/Ryujinx.Core/OsHle/Exceptions/UndefinedInstructionException.cs
--- a/Ryujinx.Core/OsHle/GlobalStateTable.cs
+++ b/Ryujinx.Core/OsHle/GlobalStateTable.cs
--- a/Ryujinx.Core/OsHle/Handles/HSharedMem.cs
+++ b/Ryujinx.Core/OsHle/Handles/HSharedMem.cs
--- a/Ryujinx.Core/OsHle/Handles/HTransferMem.cs
+++ b/Ryujinx.Core/OsHle/Handles/HTransferMem.cs
--- a/Ryujinx.Core/OsHle/Handles/KEvent.cs
+++ b/Ryujinx.Core/OsHle/Handles/KEvent.cs
--- a/Ryujinx.Core/OsHle/Handles/KProcessHandleTable.cs
+++ b/Ryujinx.Core/OsHle/Handles/KProcessHandleTable.cs
--- a/Ryujinx.Core/OsHle/Handles/KProcessScheduler.cs
+++ b/Ryujinx.Core/OsHle/Handles/KProcessScheduler.cs
--- a/Ryujinx.Core/OsHle/Handles/KSession.cs
+++ b/Ryujinx.Core/OsHle/Handles/KSession.cs
--- a/Ryujinx.Core/OsHle/Handles/KSynchronizationObject.cs
+++ b/Ryujinx.Core/OsHle/Handles/KSynchronizationObject.cs
--- a/Ryujinx.Core/OsHle/Handles/KThread.cs
+++ b/Ryujinx.Core/OsHle/Handles/KThread.cs
--- a/Ryujinx.Core/OsHle/Handles/SchedulerThread.cs
+++ b/Ryujinx.Core/OsHle/Handles/SchedulerThread.cs
--- a/Ryujinx.Core/OsHle/Handles/ThreadQueue.cs
+++ b/Ryujinx.Core/OsHle/Handles/ThreadQueue.cs
--- a/Ryujinx.Core/OsHle/Homebrew.cs
+++ b/Ryujinx.Core/OsHle/Homebrew.cs
--- a/Ryujinx.Core/OsHle/Horizon.cs
+++ b/Ryujinx.Core/OsHle/Horizon.cs
--- a/Ryujinx.Core/OsHle/IdDictionary.cs
+++ b/Ryujinx.Core/OsHle/IdDictionary.cs
--- a/Ryujinx.Core/OsHle/Ipc/IpcBuffDesc.cs
+++ b/Ryujinx.Core/OsHle/Ipc/IpcBuffDesc.cs
--- a/Ryujinx.Core/OsHle/Ipc/IpcHandleDesc.cs
+++ b/Ryujinx.Core/OsHle/Ipc/IpcHandleDesc.cs
--- a/Ryujinx.Core/OsHle/Ipc/IpcHandler.cs
+++ b/Ryujinx.Core/OsHle/Ipc/IpcHandler.cs
--- a/Ryujinx.Core/OsHle/Ipc/IpcMagic.cs
+++ b/Ryujinx.Core/OsHle/Ipc/IpcMagic.cs
--- a/Ryujinx.Core/OsHle/Ipc/IpcMessage.cs
+++ b/Ryujinx.Core/OsHle/Ipc/IpcMessage.cs
--- a/Ryujinx.Core/OsHle/Ipc/IpcMessageType.cs
+++ b/Ryujinx.Core/OsHle/Ipc/IpcMessageType.cs
--- a/Ryujinx.Core/OsHle/Ipc/IpcPtrBuffDesc.cs
+++ b/Ryujinx.Core/OsHle/Ipc/IpcPtrBuffDesc.cs
--- a/Ryujinx.Core/OsHle/Ipc/IpcRecvListBuffDesc.cs
+++ b/Ryujinx.Core/OsHle/Ipc/IpcRecvListBuffDesc.cs
--- a/Ryujinx.Core/OsHle/Ipc/ServiceProcessRequest.cs
+++ b/Ryujinx.Core/OsHle/Ipc/ServiceProcessRequest.cs
--- a/Ryujinx.Core/OsHle/Kernel/KernelErr.cs
+++ b/Ryujinx.Core/OsHle/Kernel/KernelErr.cs
--- a/Ryujinx.Core/OsHle/Kernel/NsTimeConverter.cs
+++ b/Ryujinx.Core/OsHle/Kernel/NsTimeConverter.cs
--- a/Ryujinx.Core/OsHle/Kernel/SvcHandler.cs
+++ b/Ryujinx.Core/OsHle/Kernel/SvcHandler.cs
--- a/Ryujinx.Core/OsHle/Kernel/SvcMemory.cs
+++ b/Ryujinx.Core/OsHle/Kernel/SvcMemory.cs
--- a/Ryujinx.Core/OsHle/Kernel/SvcSystem.cs
+++ b/Ryujinx.Core/OsHle/Kernel/SvcSystem.cs
--- a/Ryujinx.Core/OsHle/Kernel/SvcThread.cs
+++ b/Ryujinx.Core/OsHle/Kernel/SvcThread.cs
--- a/Ryujinx.Core/OsHle/Kernel/SvcThreadSync.cs
+++ b/Ryujinx.Core/OsHle/Kernel/SvcThreadSync.cs
--- a/Ryujinx.Core/OsHle/MemoryAllocator.cs
+++ b/Ryujinx.Core/OsHle/MemoryAllocator.cs
--- a/Ryujinx.Core/OsHle/MemoryRegions.cs
+++ b/Ryujinx.Core/OsHle/MemoryRegions.cs
--- a/Ryujinx.Core/OsHle/MemoryType.cs
+++ b/Ryujinx.Core/OsHle/MemoryType.cs
--- a/Ryujinx.Core/OsHle/Process.cs
+++ b/Ryujinx.Core/OsHle/Process.cs
--- a/Ryujinx.Core/OsHle/ServiceCtx.cs
+++ b/Ryujinx.Core/OsHle/ServiceCtx.cs
--- a/Ryujinx.Core/OsHle/Services/Acc/IAccountServiceForApplication.cs
+++ b/Ryujinx.Core/OsHle/Services/Acc/IAccountServiceForApplication.cs
--- a/Ryujinx.Core/OsHle/Services/Acc/IManagerForApplication.cs
+++ b/Ryujinx.Core/OsHle/Services/Acc/IManagerForApplication.cs
--- a/Ryujinx.Core/OsHle/Services/Acc/IProfile.cs
+++ b/Ryujinx.Core/OsHle/Services/Acc/IProfile.cs
--- a/Ryujinx.Core/OsHle/Services/Am/AmErr.cs
+++ b/Ryujinx.Core/OsHle/Services/Am/AmErr.cs
--- a/Ryujinx.Core/OsHle/Services/Am/FocusState.cs
+++ b/Ryujinx.Core/OsHle/Services/Am/FocusState.cs
--- a/Ryujinx.Core/OsHle/Services/Am/IAllSystemAppletProxiesService.cs
+++ b/Ryujinx.Core/OsHle/Services/Am/IAllSystemAppletProxiesService.cs
--- a/Show more
+++ b/Show more