Randy Heit 4deeb8d8ae Merge branch 'master' into scripting ... Conflicts: src/actor.h src/g_doom/a_doomweaps.cpp src/p_local.h src/p_map.cpp src/sdl/i_main.cpp src/thingdef/thingdef_codeptr.cpp		2013-06-25 19:28:25 -05:00
..
fixrtext	- Added Linux support for the CMakeLists. This meant downgrading them for	2008-07-25 01:37:44 +00:00
lemon	- Updated scripting branch to latest version in trunk.	2013-06-07 03:31:30 +00:00
re2c	- Added Linux support for the CMakeLists. This meant downgrading them for	2008-07-25 01:37:44 +00:00
updaterevision	- Remove the first parameter from updaterevision, since it isn't needed with git.	2013-06-24 20:58:14 -05:00
zipdir	- GCC warning fixes (GCC stupidity for the most part.)	2011-02-19 08:59:43 +00:00
CMakeLists.txt	- Fixed: Dehacked string replacement did not check the clusters' finaleflats.	2009-03-28 11:49:44 +00:00