nukeykt e6f53f7c30 Resolve merge issues ... # Conflicts: # GNUmakefile # platform/Windows/eduke32.sln # platform/Windows/props/build_common.props # source/audiolib/include/music.h # source/blood/src/blood.cpp # source/blood/src/gui.cpp # source/blood/src/mapedit.cpp # source/blood/src/sound.cpp # source/build/include/vfs.h # source/build/src/vfs.cpp		2019-10-24 19:48:11 +02:00
..
audiolib	Resolve merge issues	2019-10-24 19:48:11 +02:00
blood	Resolve merge issues	2019-10-24 19:48:11 +02:00
build	Resolve merge issues	2019-10-24 19:48:11 +02:00
common	- and the last 2 hud CVARS for Blood…	2019-10-24 01:41:55 +02:00
duke3d	Add MIDI_GetDevice and use it so that the default driver value doesn't show as "Custom" in the menu	2019-10-24 19:44:22 +02:00
glad	- use full GL 4.6 API.	2019-09-16 17:52:14 +02:00
glbackend	- converted the Polymost CVARs.	2019-10-23 21:11:37 +02:00
libsmackerdec	Resolve merge issues	2019-10-24 19:48:11 +02:00
libxmp-lite	- transitioned project to CMake and deleted most of the old build system.	2019-09-22 23:15:46 +02:00
mact	- removed most extern "C" from the rest of the code base.	2019-09-21 20:14:34 +02:00
platform	- fixed compilation.	2019-10-23 18:36:48 +02:00
rr	- ported most of the remaining HUD CVars	2019-10-24 01:30:33 +02:00
sw	SW: Load swtimbr.tmb	2019-10-24 19:46:29 +02:00
thirdparty	Silence a warning	2019-10-20 10:45:49 +02:00
CMakeLists.txt	- added GZDoom's font code and some dependencies.	2019-10-24 01:20:58 +02:00
g_pch.h	- project rework to shorten compile times.	2019-10-16 23:09:02 +02:00
sdlappicon.cpp	- transitioned project to CMake and deleted most of the old build system.	2019-09-22 23:15:46 +02:00
version.h	- fixed the setup.	2019-09-23 01:28:18 +02:00