Christoph Oelckers d15e3391a0 Merge remote-tracking branch 'remotes/origin/master' into localization ... # Conflicts: # src/v_font.cpp		2019-02-16 17:35:15 +01:00
..
static	Merge remote-tracking branch 'remotes/origin/master' into localization	2019-02-16 17:35:15 +01:00
CMakeLists.txt	- missed one qzdoom reference	2017-07-20 06:45:08 -04:00