Christoph Oelckers dda73b531c Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # src/CMakeLists.txt # src/p_setup.cpp # src/r_defs.h # src/version.h This only updates to a compileable state. The new portals are not yet functional in the hardware renderer because they require some refactoring in the data management first.		2016-02-05 12:31:41 +01: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	2016-02-05 12:31:41 +01: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