raze-gles/wadsrc
Christoph Oelckers 1a8f11e01d Merge branch 'master' into powerslave
# Conflicts:
#	source/build/src/sdlayer.cpp
#	source/common/menu/menu.cpp
#	source/sw/src/config.cpp
#	source/sw/src/game.cpp
2019-12-26 00:21:04 +01:00
..
static Merge branch 'master' into powerslave 2019-12-26 00:21:04 +01:00
CMakeLists.txt - added an engine resource file. 2019-10-04 23:29:00 +02:00