Christoph Oelckers d58d38a1d3 Merge branch 'master' of https://github.com/rheit/zdoom ... Conflicts: src/p_3dfloors.cpp		2015-07-13 21:36:19 +02:00
..
fixrtext	Merge branch 'master' of https://github.com/rheit/zdoom	2014-01-04 11:29:02 +01:00
lemon	Merge branch 'master' of https://github.com/rheit/zdoom	2015-05-01 00:08:42 +02:00
re2c	Merge branch 'master' of https://github.com/rheit/zdoom	2014-01-04 11:29:02 +01:00
updaterevision	Merge branch 'master' of https://github.com/rheit/zdoom	2015-03-31 18:25:31 +02:00
zipdir	Merge branch 'master' of https://github.com/rheit/zdoom	2015-07-13 21:36:19 +02:00
CMakeLists.txt	- Fixed: fixrtext isn't needed with Win64 builds.	2014-11-17 21:56:16 -05:00