nashmuhandes 19d2042364 Merge branch 'master' of https://github.com/coelckers/gzdoom ... # Conflicts: # src/r_things.cpp		2016-12-30 12:05:00 +08:00
..
udmf.txt	Normalize line endings	2016-03-01 09:47:10 -06:00
udmf_zdoom.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-12-29 14:34:13 +01:00
usdf.txt	- there seem to be some problems with the line endings...	2016-10-30 23:44:55 +01:00
usdf_zdoom.txt	Moved 'goodbye' from usdf.txt to usdf_zdoom.txt	2016-10-30 20:30:32 +01:00