Sally Coolatta 63917ffccc The start of the scary 2.2 merge ... All conflicts are left in-tact. We should be collaborating on solving these files one at a time.		2020-05-29 13:43:38 -04:00
..
curl	Support for http downloads	2020-04-07 18:22:29 -04:00
dll-binaries	Update libgme to 0.6.2	2018-12-30 22:49:11 -05:00
fmodex	DIE, DIE, DIE	2014-07-21 20:39:31 -04:00
gettext	SRB2 2.1 release	2014-03-15 13:11:35 -04:00
gme	Update libgme to 0.6.2	2018-12-30 22:49:11 -05:00
libopenmpt	Update these files that I forgot to update.	2019-10-14 20:41:37 -04:00
libpng-src	Fix compiling Mingw binaries on an Unix host	2019-12-05 12:50:14 -05:00
miniupnpc	SRB2 2.1 release	2014-03-15 13:11:35 -04:00
SDL2	Update ARM/ARM64 arch of SDL to 2.0.10	2019-10-31 16:27:28 -04:00
SDL2_mixer	Added static library of SDL2 and SDL2_mixer for ARM systems	2018-12-22 20:48:15 -05:00
SDLMixerX	Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'""	2019-08-04 12:03:57 +01:00
win-iconv	SRB2 2.1 release	2014-03-15 13:11:35 -04:00
zlib	The start of the scary 2.2 merge	2020-05-29 13:43:38 -04:00
.gitattributes	gitattributes: do not check whitespace for included libs	2016-05-18 10:38:29 -04:00
.gitignore	SRB2 2.1 release	2014-03-15 13:11:35 -04:00
DLL-README.txt	The start of the scary 2.2 merge	2020-05-29 13:43:38 -04:00
FMOD.props	MSVC: Move x86/x64 settings into commons props	2016-05-22 21:55:55 -04:00
libgme.props	Specify HAVE_LIBGME, paths, and depends only for Win32/x64 MSVC	2019-01-04 21:18:55 -05:00
libopenmpt.props	Add libopenmpt to VC10 project	2019-01-03 20:28:00 -05:00
libpng.props	MSVC: Move x86/x64 settings into commons props	2016-05-22 21:55:55 -04:00
SDL2.props	MSVC: Move x86/x64 settings into commons props	2016-05-22 21:55:55 -04:00
SDL_mixer.props	MSVC: Move x86/x64 settings into commons props	2016-05-22 21:55:55 -04:00
zlib.props	MSVC: Move x86/x64 settings into commons props	2016-05-22 21:55:55 -04:00
zlibVC6.diff	SRB2 2.1 release	2014-03-15 13:11:35 -04:00