Brecht Van Lommel d52400bfbd 2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317 ... Notes: * Sequence transform strip uses G.scene global, this is commented out now, should be fixed. * Etch-a-ton code was most difficult to merge. The files already in 2.5 got merged, but no new files were added. Calls to these files are commented out with "XXX etch-a-ton". editarmature.c and transform_snap.c were complex to merge. Martin, please check? * Game engine compiles and links again here for scons/make/cmake (player still fails to link).		2009-03-17 21:44:58 +00:00
..
buildinfo.c	Patch from GSR that a) fixes a whole bunch of GPL/BL license	2008-04-16 22:40:48 +00:00
CMakeLists.txt	2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317	2009-03-17 21:44:58 +00:00
creator.c	2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317	2009-03-17 21:44:58 +00:00
Makefile	2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317	2009-03-17 21:44:58 +00:00
SConscript	Merge of trunk into blender 2.5:	2008-11-12 21:16:53 +00:00