-
- Downloads
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into unslot-music
# Conflicts: # src/dehacked.c # src/f_finale.c # src/lua_baselib.c # src/lua_maplib.c # src/m_menu.c # src/p_enemy.c # src/p_inter.c # src/p_setup.c # src/p_user.c # src/s_sound.c # src/y_inter.c
Showing
- .gitattributes 2 additions, 0 deletions.gitattributes
- .travis.yml 33 additions, 0 deletions.travis.yml
- CMakeLists.txt 7 additions, 10 deletionsCMakeLists.txt
- appveyor.yml 71 additions, 0 deletionsappveyor.yml
- assets/debian/README.Debian 0 additions, 0 deletionsassets/debian/README.Debian
- assets/debian/README.source 0 additions, 0 deletionsassets/debian/README.source
- assets/debian/changelog 12 additions, 0 deletionsassets/debian/changelog
- assets/debian/compat 0 additions, 0 deletionsassets/debian/compat
- assets/debian/control 0 additions, 0 deletionsassets/debian/control
- assets/debian/copyright 0 additions, 0 deletionsassets/debian/copyright
- assets/debian/rules 2 additions, 2 deletionsassets/debian/rules
- assets/debian/source/format 1 addition, 0 deletionsassets/debian/source/format
- bin/Resources/debian/changelog 0 additions, 5 deletionsbin/Resources/debian/changelog
- bin/Resources/debian/source/format 0 additions, 1 deletionbin/Resources/debian/source/format
- cmake/Modules/FindSDL2.cmake 1 addition, 1 deletioncmake/Modules/FindSDL2.cmake
- cmake/Modules/FindSDL2_main.cmake 1 addition, 1 deletioncmake/Modules/FindSDL2_main.cmake
- cmake/Modules/FindSDL2_mixer.cmake 1 addition, 1 deletioncmake/Modules/FindSDL2_mixer.cmake
- cmake/Modules/LibFindMacros.cmake 4 additions, 4 deletionscmake/Modules/LibFindMacros.cmake
- comptime.bat 1 addition, 0 deletionscomptime.bat
- debian/control 10 additions, 4 deletionsdebian/control
Loading
Please register or sign in to comment