Christoph Oelckers 0474560ac6 Merge commit '2ec8e2c2ac61d30f7f1d666ec58ca0fd37e2e3b0' into scripting ... Conflicts: src/d_main.cpp src/info.cpp src/p_local.h (Had to merge this all by itself because it was creating too many merge conflicts when combined with other stuff.		2015-04-28 12:54:01 +02:00
..
static	Merge commit '2ec8e2c2ac61d30f7f1d666ec58ca0fd37e2e3b0' into scripting	2015-04-28 12:54:01 +02: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