nashmuhandes 59511fe228 Merge branch 'master' of https://github.com/coelckers/gzdoom ... # Conflicts: # src/CMakeLists.txt		2016-09-05 20:42:44 +08:00
..
licenses	- added xBRZ texture scaler after clearing the licensing conditions. A screenshot of the confirmation that this is ok has been added to the 'licenses' folder.	2016-09-03 14:01:51 +02: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