Randy Heit 2d87eb0ba2 Merge branch 'master' into gonesolong ... Conflicts: src/CMakeLists.txt src/actor.h src/g_heretic/a_hereticmisc.cpp src/g_heretic/a_hereticweaps.cpp src/g_heretic/a_ironlich.cpp src/info.h src/namedef.h src/p_buildmap.cpp src/p_enemy.cpp src/p_map.cpp src/p_mobj.cpp src/thingdef/thingdef_codeptr.cpp zdoom.vcproj		2014-12-20 19:13:14 -06: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	- Simplify CMake GCC and Clang checking.	2014-06-26 01:23:41 +02:00
zipdir	fixed compilation with latest LZMA SDK on Windows.	2014-06-26 09:43:51 +02:00
CMakeLists.txt	- 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