Rachael Alexanderson 7dda264752 Merge branch 'master' of https://github.com/coelckers/gzdoom ... # Conflicts: # wadsrc/static/zscript/base.txt # wadsrc/static/zscript/mapdata.txt		2018-03-03 17:31:53 -05:00
..
static	Make sidedef vertex and secplane height functions callable from ui	2018-03-03 17:10:32 +01:00
CMakeLists.txt	- qzdoom again so build scripts don't get confused.	2017-08-09 18:07:44 -04:00