There was an error fetching the commit references. Please try again later.
Fix merge conflicts
Showing
- .gitignore 16 additions, 0 deletions.gitignore
- .gitmodules 6 additions, 0 deletions.gitmodules
- .travis-build.sh 1 addition, 0 deletions.travis-build.sh
- .travis-deps.sh 10 additions, 3 deletions.travis-deps.sh
- .travis.yml 5 additions, 0 deletions.travis.yml
- CMakeLists.txt 36 additions, 6 deletionsCMakeLists.txt
- CONTRIBUTING.md 1 addition, 0 deletionsCONTRIBUTING.md
- Doxyfile 1 addition, 1 deletionDoxyfile
- README.md 18 additions, 4 deletionsREADME.md
- externals/boost 1 addition, 0 deletionsexternals/boost
- externals/nihstro 1 addition, 0 deletionsexternals/nihstro
- src/citra/CMakeLists.txt 6 additions, 8 deletionssrc/citra/CMakeLists.txt
- src/citra/citra.cpp 17 additions, 8 deletionssrc/citra/citra.cpp
- src/citra/config.cpp 13 additions, 17 deletionssrc/citra/config.cpp
- src/citra/config.h 2 additions, 5 deletionssrc/citra/config.h
- src/citra/default_ini.h 4 additions, 3 deletionssrc/citra/default_ini.h
- src/citra/emu_window/emu_window_glfw.cpp 15 additions, 11 deletionssrc/citra/emu_window/emu_window_glfw.cpp
- src/citra/emu_window/emu_window_glfw.h 1 addition, 1 deletionsrc/citra/emu_window/emu_window_glfw.h
- src/citra_qt/CMakeLists.txt 11 additions, 0 deletionssrc/citra_qt/CMakeLists.txt
- src/citra_qt/bootmanager.cpp 16 additions, 7 deletionssrc/citra_qt/bootmanager.cpp
Loading
Please register or sign in to comment