Randy Heit 9c86f1c220 Merge branch 'master' into scripting for plugged userinfo memory leak ... Conflicts: src/d_player.h src/p_interaction.cpp src/thingdef/thingdef_codeptr.cpp		2013-07-23 21:01:13 -05:00
..
static	Merge branch 'master' into scripting for plugged userinfo memory leak	2013-07-23 21:01:13 -05:00
CMakeLists.txt	- Allow generator expressions to be turned off during pk3 building with CMake.	2013-07-01 16:57:46 -04:00
wadsrc.vcproj	- removed obsolete references to 'generated' directory from Wadsrc project.	2011-01-09 13:49:54 +00:00