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
..
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
lemon.c	Update lemon.c to August 2012 version from SQLite.	2013-08-02 22:17:32 -05:00
lemon.html	Directory restructuring to make it easier to version projects that don't build zdoom.exe.	2006-02-24 04:48:15 +00:00
lemon.vcproj	About a week's worth of changes here. As a heads-up, I wouldn't be	2008-07-23 04:57:26 +00:00
lempar.c	- Update Lemon to the latest SQLite CVS versions:	2010-02-21 04:33:08 +00:00