Commit graph

6 commits

Author SHA1 Message Date
nashmuhandes
2b82758c8f Revert "Removed irrelevant voxel code notice in the README (the software renderer doesn't even exist in the current iteration)"
This reverts commit 361feaaadc.
2017-03-10 17:18:54 +08:00
nashmuhandes
361feaaadc Removed irrelevant voxel code notice in the README (the software renderer doesn't even exist in the current iteration) 2017-02-09 19:26:10 +08:00
nashmuhandes
032ad95b0f Merge branch 'master' of https://github.com/coelckers/gzdoom
# Conflicts:
#	docs/licenses/README.TXT
#	src/gl/dynlights/gl_dynlight.cpp
#	src/r_bsp.cpp
#	src/r_draw.cpp
#	src/r_plane.h
#	src/r_things.cpp
#	src/r_things.h
#	src/win32/fb_d3d9.cpp
#	src/win32/win32video.cpp
#	src/win32/zdoom.rc
2017-02-05 20:13:39 +08:00
Christoph Oelckers
0c3aab794f - corrections to license file. 2017-01-15 12:17:48 +01:00
nashmuhandes
6018c716e2 Removed a couple of unused licenses 2016-09-05 21:24:10 +08:00
Christoph Oelckers
bf5f10a897 - added all relevant licenses to docs. 2016-09-02 10:48:38 +02:00