Merge branch 'master' into travis-deployer
# Conflicts: # .travis.yml
Showing
- .circleci/config.yml 9 additions, 3 deletions.circleci/config.yml
- .travis.yml 27 additions, 17 deletions.travis.yml
- CMakeLists.txt 9 additions, 3 deletionsCMakeLists.txt
- libs/dll-binaries/i686/libgme.dll 0 additions, 0 deletionslibs/dll-binaries/i686/libgme.dll
- libs/dll-binaries/x86_64/libgme.dll 0 additions, 0 deletionslibs/dll-binaries/x86_64/libgme.dll
- libs/gme/CMakeLists.txt 6 additions, 4 deletionslibs/gme/CMakeLists.txt
- libs/gme/changes.txt 2 additions, 259 deletionslibs/gme/changes.txt
- libs/gme/demo/basics.c 7 additions, 4 deletionslibs/gme/demo/basics.c
- libs/gme/demo/cpp_basics.cpp 7 additions, 4 deletionslibs/gme/demo/cpp_basics.cpp
- libs/gme/gme.txt 6 additions, 6 deletionslibs/gme/gme.txt
- libs/gme/gme/CMakeLists.txt 2 additions, 2 deletionslibs/gme/gme/CMakeLists.txt
- libs/gme/gme/Data_Reader.cpp 25 additions, 9 deletionslibs/gme/gme/Data_Reader.cpp
- libs/gme/gme/Data_Reader.h 3 additions, 1 deletionlibs/gme/gme/Data_Reader.h
- libs/gme/gme/Music_Emu.cpp 11 additions, 2 deletionslibs/gme/gme/Music_Emu.cpp
- libs/gme/gme/Music_Emu.h 6 additions, 0 deletionslibs/gme/gme/Music_Emu.h
- libs/gme/gme/Nsfe_Emu.cpp 3 additions, 0 deletionslibs/gme/gme/Nsfe_Emu.cpp
- libs/gme/gme/Spc_Cpu.cpp 1 addition, 3 deletionslibs/gme/gme/Spc_Cpu.cpp
- libs/gme/gme/Spc_Cpu.h 6 additions, 5 deletionslibs/gme/gme/Spc_Cpu.h
- libs/gme/gme/blargg_source.h 13 additions, 0 deletionslibs/gme/gme/blargg_source.h
- libs/gme/gme/gme.cpp 2 additions, 0 deletionslibs/gme/gme/gme.cpp
Loading
Please register or sign in to comment