Braden Obrzut 97d7b1e59e Merge branch 'origin/maint' ... Conflicts: src/sound/fmodsound.cpp		2013-10-23 19:39:22 -04:00
..
static	Merge branch 'origin/maint'	2013-10-23 19:39:22 -04: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