Christoph Oelckers 792cad89b3 Merge commit '3849cb86231ce24131a86e9c29795a8cf3706a3d' into scripting ... Conflicts: src/g_hexen/a_clericstaff.cpp src/g_hexen/a_hexenspecialdecs.cpp src/p_acs.cpp src/p_enemy.cpp src/p_interaction.cpp src/thingdef/thingdef_codeptr.cpp src/thingdef/thingdef_expression.cpp (Scripting branch update part 4)		2015-04-28 11:59:33 +02:00
..
fixrtext	- Add support for cross compiling so that OS X PowerPC builds can still be made on systems without rosetta (10.7+). (Compiling x86 binaries on ppc should also be possible.)	2014-01-02 01:59:04 -05:00
lemon	Merge branch 'master' into gonesolong	2014-12-20 19:13:14 -06:00
re2c	- Add support for cross compiling so that OS X PowerPC builds can still be made on systems without rosetta (10.7+). (Compiling x86 binaries on ppc should also be possible.)	2014-01-02 01:59:04 -05:00
updaterevision	- Cleared developer warnings with modern (3.0+) versions of CMake.	2015-03-23 23:28:18 -04:00
zipdir	Remove warnings warned by Clang	2015-03-08 17:21:15 -05:00
CMakeLists.txt	- Fixed: fixrtext isn't needed with Win64 builds.	2014-11-17 21:56:16 -05:00