mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Correct conflict"

Browse source 
This reverts commit a3f466e62b.
This commit is contained in:
greggameplayer 2018-06-11 03:21:05 +02:00
commit 05bbd54fd0
236 changed files with 1757 additions and 1757 deletions
Download patch file Download diff file Expand all files Collapse all files

0
Ryujinx.HLE/Gpu/BlockLinearSwizzle.cs → Ryujinx.Core/Gpu/BlockLinearSwizzle.cs
View file

0
Ryujinx.HLE/Gpu/INvGpuEngine.cs → Ryujinx.Core/Gpu/INvGpuEngine.cs
View file

0
Ryujinx.HLE/Gpu/ISwizzle.cs → Ryujinx.Core/Gpu/ISwizzle.cs
View file

0
Ryujinx.HLE/Gpu/LinearSwizzle.cs → Ryujinx.Core/Gpu/LinearSwizzle.cs
View file

0
Ryujinx.HLE/Gpu/MacroInterpreter.cs → Ryujinx.Core/Gpu/MacroInterpreter.cs
View file

0
Ryujinx.HLE/Gpu/NvGpu.cs → Ryujinx.Core/Gpu/NvGpu.cs
View file

0
Ryujinx.HLE/Gpu/NvGpuBufferType.cs → Ryujinx.Core/Gpu/NvGpuBufferType.cs
View file

0
Ryujinx.HLE/Gpu/NvGpuEngine.cs → Ryujinx.Core/Gpu/NvGpuEngine.cs
View file

0
Ryujinx.HLE/Gpu/NvGpuEngine2d.cs → Ryujinx.Core/Gpu/NvGpuEngine2d.cs
View file

0
Ryujinx.HLE/Gpu/NvGpuEngine2dReg.cs → Ryujinx.Core/Gpu/NvGpuEngine2dReg.cs
View file

0
Ryujinx.HLE/Gpu/NvGpuEngine3d.cs → Ryujinx.Core/Gpu/NvGpuEngine3d.cs
View file

0
Ryujinx.HLE/Gpu/NvGpuEngine3dReg.cs → Ryujinx.Core/Gpu/NvGpuEngine3dReg.cs
View file

0
Ryujinx.HLE/Gpu/NvGpuFifo.cs → Ryujinx.Core/Gpu/NvGpuFifo.cs
View file

0
Ryujinx.HLE/Gpu/NvGpuFifoMeth.cs → Ryujinx.Core/Gpu/NvGpuFifoMeth.cs
View file

0
Ryujinx.HLE/Gpu/NvGpuMethod.cs → Ryujinx.Core/Gpu/NvGpuMethod.cs
View file

0
Ryujinx.HLE/Gpu/NvGpuPBEntry.cs → Ryujinx.Core/Gpu/NvGpuPBEntry.cs
View file

0
Ryujinx.HLE/Gpu/NvGpuPushBuffer.cs → Ryujinx.Core/Gpu/NvGpuPushBuffer.cs
View file

0
Ryujinx.HLE/Gpu/NvGpuVmm.cs → Ryujinx.Core/Gpu/NvGpuVmm.cs
View file

0
Ryujinx.HLE/Gpu/NvGpuVmmCache.cs → Ryujinx.Core/Gpu/NvGpuVmmCache.cs
View file

0
Ryujinx.HLE/Gpu/Texture.cs → Ryujinx.Core/Gpu/Texture.cs
View file

0
Ryujinx.HLE/Gpu/TextureFactory.cs → Ryujinx.Core/Gpu/TextureFactory.cs
View file

0
Ryujinx.HLE/Gpu/TextureHelper.cs → Ryujinx.Core/Gpu/TextureHelper.cs
View file

0
Ryujinx.HLE/Gpu/TextureReader.cs → Ryujinx.Core/Gpu/TextureReader.cs
View file

0
Ryujinx.HLE/Gpu/TextureSwizzle.cs → Ryujinx.Core/Gpu/TextureSwizzle.cs
View file

0
Ryujinx.HLE/Gpu/TextureWriter.cs → Ryujinx.Core/Gpu/TextureWriter.cs
View file

0
Ryujinx.HLE/Hid/Hid.cs → Ryujinx.Core/Hid/Hid.cs
View file

0
Ryujinx.HLE/Hid/HidControllerButtons.cs → Ryujinx.Core/Hid/HidControllerButtons.cs
View file

0
Ryujinx.HLE/Hid/HidControllerColorDesc.cs → Ryujinx.Core/Hid/HidControllerColorDesc.cs
View file

0
Ryujinx.HLE/Hid/HidControllerConnState.cs → Ryujinx.Core/Hid/HidControllerConnState.cs
View file

0
Ryujinx.HLE/Hid/HidControllerId.cs → Ryujinx.Core/Hid/HidControllerId.cs
View file

0
Ryujinx.HLE/Hid/HidControllerLayouts.cs → Ryujinx.Core/Hid/HidControllerLayouts.cs
View file

0
Ryujinx.HLE/Hid/HidControllerType.cs → Ryujinx.Core/Hid/HidControllerType.cs
View file

0
Ryujinx.HLE/Hid/HidJoystickPosition.cs → Ryujinx.Core/Hid/HidJoystickPosition.cs
View file

0
Ryujinx.HLE/Hid/HidTouchPoint.cs → Ryujinx.Core/Hid/HidTouchPoint.cs
View file

0
Ryujinx.HLE/Hid/JoyCon.cs → Ryujinx.Core/Hid/JoyCon.cs
View file

0
Ryujinx.HLE/Hid/JoyConColor.cs → Ryujinx.Core/Hid/JoyConColor.cs
View file

0
Ryujinx.HLE/Loaders/Compression/Lz4.cs → Ryujinx.Core/Loaders/Compression/Lz4.cs
View file

0
Ryujinx.HLE/Loaders/ElfDyn.cs → Ryujinx.Core/Loaders/ElfDyn.cs
View file

0
Ryujinx.HLE/Loaders/ElfDynTag.cs → Ryujinx.Core/Loaders/ElfDynTag.cs
View file

0
Ryujinx.HLE/Loaders/ElfRel.cs → Ryujinx.Core/Loaders/ElfRel.cs
View file

0
Ryujinx.HLE/Loaders/ElfRelType.cs → Ryujinx.Core/Loaders/ElfRelType.cs
View file

0
Ryujinx.HLE/Loaders/ElfSym.cs → Ryujinx.Core/Loaders/ElfSym.cs
View file

0
Ryujinx.HLE/Loaders/ElfSymBinding.cs → Ryujinx.Core/Loaders/ElfSymBinding.cs
View file

0
Ryujinx.HLE/Loaders/ElfSymType.cs → Ryujinx.Core/Loaders/ElfSymType.cs
View file

0
Ryujinx.HLE/Loaders/ElfSymVisibility.cs → Ryujinx.Core/Loaders/ElfSymVisibility.cs
View file

0
Ryujinx.HLE/Loaders/Executable.cs → Ryujinx.Core/Loaders/Executable.cs
View file

0
Ryujinx.HLE/Loaders/Executables/IExecutable.cs → Ryujinx.Core/Loaders/Executables/IExecutable.cs
View file

0
Ryujinx.HLE/Loaders/Executables/Nro.cs → Ryujinx.Core/Loaders/Executables/Nro.cs
View file

0
Ryujinx.HLE/Loaders/Executables/Nso.cs → Ryujinx.Core/Loaders/Executables/Nso.cs
View file

0
Ryujinx.HLE/Logging/LogClass.cs → Ryujinx.Core/Logging/LogClass.cs
View file

0
Ryujinx.HLE/Logging/LogEventArgs.cs → Ryujinx.Core/Logging/LogEventArgs.cs
View file

0
Ryujinx.HLE/Logging/LogLevel.cs → Ryujinx.Core/Logging/LogLevel.cs
View file

0
Ryujinx.HLE/Logging/Logger.cs → Ryujinx.Core/Logging/Logger.cs
View file

0
Ryujinx.HLE/OsHle/AppletStateMgr.cs → Ryujinx.Core/OsHle/AppletStateMgr.cs
View file

0
Ryujinx.HLE/OsHle/Diagnostics/Demangler.cs → Ryujinx.Core/OsHle/Diagnostics/Demangler.cs
View file

0
Ryujinx.HLE/OsHle/ErrorCode.cs → Ryujinx.Core/OsHle/ErrorCode.cs
View file

0
Ryujinx.HLE/OsHle/ErrorModule.cs → Ryujinx.Core/OsHle/ErrorModule.cs
View file

0
Ryujinx.HLE/OsHle/Exceptions/GuestBrokeExecutionException.cs → Ryujinx.Core/OsHle/Exceptions/GuestBrokeExecutionException.cs
View file

0
Ryujinx.HLE/OsHle/Exceptions/UndefinedInstructionException.cs → Ryujinx.Core/OsHle/Exceptions/UndefinedInstructionException.cs
View file

0
Ryujinx.HLE/OsHle/GlobalStateTable.cs → Ryujinx.Core/OsHle/GlobalStateTable.cs
View file

0
Ryujinx.HLE/OsHle/Handles/HSharedMem.cs → Ryujinx.Core/OsHle/Handles/HSharedMem.cs
View file

0
Ryujinx.HLE/OsHle/Handles/HTransferMem.cs → Ryujinx.Core/OsHle/Handles/HTransferMem.cs
View file

0
Ryujinx.HLE/OsHle/Handles/KEvent.cs → Ryujinx.Core/OsHle/Handles/KEvent.cs
View file

0
Ryujinx.HLE/OsHle/Handles/KProcessHandleTable.cs → Ryujinx.Core/OsHle/Handles/KProcessHandleTable.cs
View file

0
Ryujinx.HLE/OsHle/Handles/KProcessScheduler.cs → Ryujinx.Core/OsHle/Handles/KProcessScheduler.cs
View file

0
Ryujinx.HLE/OsHle/Handles/KSession.cs → Ryujinx.Core/OsHle/Handles/KSession.cs
View file

0
Ryujinx.HLE/OsHle/Handles/KSynchronizationObject.cs → Ryujinx.Core/OsHle/Handles/KSynchronizationObject.cs
View file

0
Ryujinx.HLE/OsHle/Handles/KThread.cs → Ryujinx.Core/OsHle/Handles/KThread.cs
View file

0
Ryujinx.HLE/OsHle/Handles/SchedulerThread.cs → Ryujinx.Core/OsHle/Handles/SchedulerThread.cs
View file

0
Ryujinx.HLE/OsHle/Handles/ThreadQueue.cs → Ryujinx.Core/OsHle/Handles/ThreadQueue.cs
View file

0
Ryujinx.HLE/OsHle/Homebrew.cs → Ryujinx.Core/OsHle/Homebrew.cs
View file

0
Ryujinx.HLE/OsHle/Horizon.cs → Ryujinx.Core/OsHle/Horizon.cs
View file

0
Ryujinx.HLE/OsHle/IdDictionary.cs → Ryujinx.Core/OsHle/IdDictionary.cs
View file

0
Ryujinx.HLE/OsHle/Ipc/IpcBuffDesc.cs → Ryujinx.Core/OsHle/Ipc/IpcBuffDesc.cs
View file

0
Ryujinx.HLE/OsHle/Ipc/IpcHandleDesc.cs → Ryujinx.Core/OsHle/Ipc/IpcHandleDesc.cs
View file

0
Ryujinx.HLE/OsHle/Ipc/IpcHandler.cs → Ryujinx.Core/OsHle/Ipc/IpcHandler.cs
View file

0
Ryujinx.HLE/OsHle/Ipc/IpcMagic.cs → Ryujinx.Core/OsHle/Ipc/IpcMagic.cs
View file

0
Ryujinx.HLE/OsHle/Ipc/IpcMessage.cs → Ryujinx.Core/OsHle/Ipc/IpcMessage.cs
View file

0
Ryujinx.HLE/OsHle/Ipc/IpcMessageType.cs → Ryujinx.Core/OsHle/Ipc/IpcMessageType.cs
View file

0
Ryujinx.HLE/OsHle/Ipc/IpcPtrBuffDesc.cs → Ryujinx.Core/OsHle/Ipc/IpcPtrBuffDesc.cs
View file

0
Ryujinx.HLE/OsHle/Ipc/IpcRecvListBuffDesc.cs → Ryujinx.Core/OsHle/Ipc/IpcRecvListBuffDesc.cs
View file

0
Ryujinx.HLE/OsHle/Ipc/ServiceProcessRequest.cs → Ryujinx.Core/OsHle/Ipc/ServiceProcessRequest.cs
View file

0
Ryujinx.HLE/OsHle/Kernel/KernelErr.cs → Ryujinx.Core/OsHle/Kernel/KernelErr.cs
View file

0
Ryujinx.HLE/OsHle/Kernel/NsTimeConverter.cs → Ryujinx.Core/OsHle/Kernel/NsTimeConverter.cs
View file

0
Ryujinx.HLE/OsHle/Kernel/SvcHandler.cs → Ryujinx.Core/OsHle/Kernel/SvcHandler.cs
View file

0
Ryujinx.HLE/OsHle/Kernel/SvcMemory.cs → Ryujinx.Core/OsHle/Kernel/SvcMemory.cs
View file

0
Ryujinx.HLE/OsHle/Kernel/SvcSystem.cs → Ryujinx.Core/OsHle/Kernel/SvcSystem.cs
View file

0
Ryujinx.HLE/OsHle/Kernel/SvcThread.cs → Ryujinx.Core/OsHle/Kernel/SvcThread.cs
View file

0
Ryujinx.HLE/OsHle/Kernel/SvcThreadSync.cs → Ryujinx.Core/OsHle/Kernel/SvcThreadSync.cs
View file

0
Ryujinx.HLE/OsHle/MemoryAllocator.cs → Ryujinx.Core/OsHle/MemoryAllocator.cs
View file

0
Ryujinx.HLE/OsHle/MemoryRegions.cs → Ryujinx.Core/OsHle/MemoryRegions.cs
View file

0
Ryujinx.HLE/OsHle/MemoryType.cs → Ryujinx.Core/OsHle/MemoryType.cs
View file

0
Ryujinx.HLE/OsHle/Process.cs → Ryujinx.Core/OsHle/Process.cs
View file

0
Ryujinx.HLE/OsHle/ServiceCtx.cs → Ryujinx.Core/OsHle/ServiceCtx.cs
View file

0
Ryujinx.HLE/OsHle/Services/Acc/IAccountServiceForApplication.cs → Ryujinx.Core/OsHle/Services/Acc/IAccountServiceForApplication.cs
View file

0
Ryujinx.HLE/OsHle/Services/Acc/IManagerForApplication.cs → Ryujinx.Core/OsHle/Services/Acc/IManagerForApplication.cs
View file

0
Ryujinx.HLE/OsHle/Services/Acc/IProfile.cs → Ryujinx.Core/OsHle/Services/Acc/IProfile.cs
View file

0
Ryujinx.HLE/OsHle/Services/Am/AmErr.cs → Ryujinx.Core/OsHle/Services/Am/AmErr.cs
View file

0
Ryujinx.HLE/OsHle/Services/Am/FocusState.cs → Ryujinx.Core/OsHle/Services/Am/FocusState.cs
View file

0
Ryujinx.HLE/OsHle/Services/Am/IAllSystemAppletProxiesService.cs → Ryujinx.Core/OsHle/Services/Am/IAllSystemAppletProxiesService.cs
View file

Some files were not shown because too many files have changed in this diff Show more