nashmuhandes a7be71bda1 Merge branch 'master' of https://github.com/coelckers/gzdoom ... # Conflicts: # src/CMakeLists.txt # src/r_main.cpp		2016-09-15 13:06:51 +08:00
..
licenses	Merge branch 'master' of https://github.com/coelckers/gzdoom	2016-09-15 13:06:51 +08:00
GZDoom License.md	Remove outdated and redundant files from the docs folder, and added the GZDoom license file.	2016-04-27 22:36:19 +08:00