There was an error fetching the commit references. Please try again later.
Merge branch 'hardware-interface'
Conflicts: src/core/src/core.h
No related branches found
No related tags found
Showing
- citra.sln 12 additions, 1 deletioncitra.sln
- src/citra/citra.vcxproj 3 additions, 0 deletionssrc/citra/citra.vcxproj
- src/citra/src/citra.cpp 2 additions, 34 deletionssrc/citra/src/citra.cpp
- src/citra/src/emu_window/emu_window_glfw.cpp 3 additions, 1 deletionsrc/citra/src/emu_window/emu_window_glfw.cpp
- src/citra/src/emu_window/emu_window_glfw.h 1 addition, 4 deletionssrc/citra/src/emu_window/emu_window_glfw.h
- src/common/src/common.h 5 additions, 0 deletionssrc/common/src/common.h
- src/common/src/common_types.h 104 additions, 29 deletionssrc/common/src/common_types.h
- src/common/src/emu_window.h 1 addition, 1 deletionsrc/common/src/emu_window.h
- src/common/src/log.h 3 additions, 3 deletionssrc/common/src/log.h
- src/common/src/log_manager.cpp 47 additions, 47 deletionssrc/common/src/log_manager.cpp
- src/core/core.vcxproj 4 additions, 0 deletionssrc/core/core.vcxproj
- src/core/core.vcxproj.filters 15 additions, 0 deletionssrc/core/core.vcxproj.filters
- src/core/src/arm/arm_interface.h 45 additions, 4 deletionssrc/core/src/arm/arm_interface.h
- src/core/src/arm/interpreter/arm_interpreter.cpp 22 additions, 22 deletionssrc/core/src/arm/interpreter/arm_interpreter.cpp
- src/core/src/arm/interpreter/arm_interpreter.h 7 additions, 0 deletionssrc/core/src/arm/interpreter/arm_interpreter.h
- src/core/src/core.cpp 5 additions, 1 deletionsrc/core/src/core.cpp
- src/core/src/core.h 3 additions, 0 deletionssrc/core/src/core.h
- src/core/src/hw/hw.cpp 69 additions, 0 deletionssrc/core/src/hw/hw.cpp
- src/core/src/hw/hw.h 44 additions, 0 deletionssrc/core/src/hw/hw.h
- src/core/src/hw/hw_lcd.cpp 65 additions, 0 deletionssrc/core/src/hw/hw_lcd.cpp
Loading
Please register or sign in to comment