nashmuhandes e5e7e85b81 Merge branch 'master' of https://github.com/coelckers/gzdoom ... # Conflicts: # src/CMakeLists.txt # src/basicinlines.h # src/m_fixed.h # src/r_3dfloors.h # src/r_bsp.cpp # src/r_bsp.h # src/r_draw.cpp # src/r_draw.h # src/r_main.cpp # src/r_main.h # src/r_plane.h # src/r_segs.h # src/r_swrenderer.cpp # src/r_things.cpp # src/r_things.h # src/win32/fb_d3d9.cpp # src/win32/fb_ddraw.cpp # wadsrc_lights/static/doomdefs.txt # wadsrc_lights/static/hticdefs.txt		2016-12-23 00:51:30 +08:00
..
udmf.txt	Normalize line endings	2016-03-01 09:47:10 -06:00
udmf_zdoom.txt	- updated list of render styles in UDMF spec.	2016-12-05 11:50:41 +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