Christoph Oelckers b3c335cd1d Merge branch 'menu_for_real' of https://github.com/coelckers/demolition into menu_for_real ... # Conflicts: # source/common/menu/loadsavemenu.cpp # source/duke3d/src/d_menu.cpp # source/rr/src/d_menu.cpp		2019-11-30 01:06:37 +01:00
..
static	Merge branch 'menu_for_real' of https://github.com/coelckers/demolition into menu_for_real	2019-11-30 01:06:37 +01:00
CMakeLists.txt	- added an engine resource file.	2019-10-04 23:29:00 +02:00