nashmuhandes f45561b5e8 Merge branch 'master' of https://github.com/coelckers/gzdoom ... # Conflicts: # wadsrc_bm/static/filter/doom.doom1/gldefs.bm # wadsrc_bm/static/filter/heretic/gldefs.bm # wadsrc_bm/static/filter/hexen/gldefs.bm # wadsrc_bm/static/filter/strife/gldefs.bm # wadsrc_lights/static/filter/doom.doom1/gldefs.txt # wadsrc_lights/static/filter/heretic/gldefs.txt # wadsrc_lights/static/filter/hexen/gldefs.txt # wadsrc_lights/static/filter/strife/gldefs.txt		2017-01-04 14:32:15 +08:00
..
static	Merge branch 'master' of https://github.com/coelckers/gzdoom	2017-01-04 14:32:15 +08:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00