nashmuhandes 799ba36610 Merge branch 'master' of https://github.com/coelckers/gzdoom ... # Conflicts: # src/r_things.cpp		2016-10-17 20:58:30 +08:00
..
udmf.txt	Normalize line endings	2016-03-01 09:47:10 -06:00
udmf_zdoom.txt	- added UDMF portal flags. Names are identical with Eternity for compatibility reasons.	2016-10-02 00:31:25 +02:00
usdf.txt	Again...	2016-10-14 23:11:57 +02:00
usdf_zdoom.txt	Normalize line endings	2016-03-01 09:47:10 -06:00