Merge remote-tracking branch 'origin/master' into credits-update
Showing
- assets/CMakeLists.txt 3 additions, 4 deletionsassets/CMakeLists.txt
- extras/conf/SRB2-22.cfg 258 additions, 156 deletionsextras/conf/SRB2-22.cfg
- libs/SDL2/COPYING.txt 1 addition, 1 deletionlibs/SDL2/COPYING.txt
- libs/SDL2/WhatsNew.txt 32 additions, 0 deletionslibs/SDL2/WhatsNew.txt
- libs/SDL2/docs/README-android.md 24 additions, 6 deletionslibs/SDL2/docs/README-android.md
- libs/SDL2/docs/README-linux.md 0 additions, 3 deletionslibs/SDL2/docs/README-linux.md
- libs/SDL2/docs/README-macosx.md 1 addition, 1 deletionlibs/SDL2/docs/README-macosx.md
- libs/SDL2/docs/README-porting.md 1 addition, 1 deletionlibs/SDL2/docs/README-porting.md
- libs/SDL2/docs/README-winrt.md 5 additions, 2 deletionslibs/SDL2/docs/README-winrt.md
- libs/SDL2/i686-w64-mingw32/bin/SDL2.dll 0 additions, 0 deletionslibs/SDL2/i686-w64-mingw32/bin/SDL2.dll
- libs/SDL2/i686-w64-mingw32/bin/sdl2-config 2 additions, 2 deletionslibs/SDL2/i686-w64-mingw32/bin/sdl2-config
- libs/SDL2/i686-w64-mingw32/include/SDL2/SDL.h 1 addition, 1 deletionlibs/SDL2/i686-w64-mingw32/include/SDL2/SDL.h
- libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_assert.h 1 addition, 1 deletionlibs/SDL2/i686-w64-mingw32/include/SDL2/SDL_assert.h
- libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_atomic.h 20 additions, 2 deletionslibs/SDL2/i686-w64-mingw32/include/SDL2/SDL_atomic.h
- libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_audio.h 47 additions, 14 deletionslibs/SDL2/i686-w64-mingw32/include/SDL2/SDL_audio.h
- libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_bits.h 10 additions, 1 deletionlibs/SDL2/i686-w64-mingw32/include/SDL2/SDL_bits.h
- libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_blendmode.h 7 additions, 7 deletionslibs/SDL2/i686-w64-mingw32/include/SDL2/SDL_blendmode.h
- libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_clipboard.h 1 addition, 1 deletionlibs/SDL2/i686-w64-mingw32/include/SDL2/SDL_clipboard.h
- libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_config.h 1 addition, 1 deletionlibs/SDL2/i686-w64-mingw32/include/SDL2/SDL_config.h
- libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_cpuinfo.h 90 additions, 8 deletionslibs/SDL2/i686-w64-mingw32/include/SDL2/SDL_cpuinfo.h
Loading
Please register or sign in to comment