Merge remote-tracking branch 'origin/master' into mgba_switch_hack
Showing
- .travis-deps.sh 0 additions, 15 deletions.travis-deps.sh
- .travis.yml 23 additions, 7 deletions.travis.yml
- CHANGES 1 addition, 0 deletionsCHANGES
- CMakeLists.txt 10 additions, 3 deletionsCMakeLists.txt
- include/mgba-util/formatting.h 2 additions, 2 deletionsinclude/mgba-util/formatting.h
- src/core/thread.c 3 additions, 0 deletionssrc/core/thread.c
- src/feature/video-logger.c 12 additions, 0 deletionssrc/feature/video-logger.c
- src/gb/renderers/software.c 20 additions, 1 deletionsrc/gb/renderers/software.c
- src/gba/bios.c 1 addition, 1 deletionsrc/gba/bios.c
- src/gba/gba.c 1 addition, 0 deletionssrc/gba/gba.c
- src/platform/qt/DisplayGL.cpp 10 additions, 5 deletionssrc/platform/qt/DisplayGL.cpp
- src/platform/qt/LogController.cpp 4 additions, 0 deletionssrc/platform/qt/LogController.cpp
- src/platform/qt/LogController.h 1 addition, 0 deletionssrc/platform/qt/LogController.h
- src/platform/qt/library/LibraryController.cpp 4 additions, 4 deletionssrc/platform/qt/library/LibraryController.cpp
- src/platform/qt/library/LibraryController.h 2 additions, 2 deletionssrc/platform/qt/library/LibraryController.h
- src/platform/qt/library/LibraryTree.cpp 6 additions, 0 deletionssrc/platform/qt/library/LibraryTree.cpp