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
..
CMakeLists.txt	2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17853:HEAD	2009-01-26 08:34:40 +00:00
GPG_Application.cpp	2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17853:HEAD	2009-01-26 08:34:40 +00:00
GPG_Application.h	Fix (harmless) error print about GameLogic.globalDict being lost. Also	2008-09-16 19:25:35 +00:00
GPG_Canvas.cpp	Patch from GSR that a) fixes a whole bunch of GPL/BL license	2008-04-16 22:40:48 +00:00
GPG_Canvas.h	Patch from GSR that a) fixes a whole bunch of GPL/BL license	2008-04-16 22:40:48 +00:00
GPG_ghost.cpp	2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317	2009-03-17 21:44:58 +00:00
GPG_KeyboardDevice.cpp	Patch from GSR that a) fixes a whole bunch of GPL/BL license	2008-04-16 22:40:48 +00:00
GPG_KeyboardDevice.h	Patch from GSR that a) fixes a whole bunch of GPL/BL license	2008-04-16 22:40:48 +00:00
GPG_System.cpp	Patch from GSR that a) fixes a whole bunch of GPL/BL license	2008-04-16 22:40:48 +00:00
GPG_System.h	Patch from GSR that a) fixes a whole bunch of GPL/BL license	2008-04-16 22:40:48 +00:00
Makefile	2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17853:HEAD	2009-01-26 08:34:40 +00:00
SConscript	2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317	2009-03-17 21:44:58 +00:00