Campbell Barton 74c6c91ba6 svn merge ^/trunk/blender -r42080:42095		2011-11-23 17:14:27 +00:00
..
CMakeLists.txt	remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n	2011-10-23 17:52:20 +00:00
SConscript	manually copy more changes from trunk.	2011-05-12 09:02:39 +00:00
stubs.c	svn merge ^/trunk/blender -r42080:42095	2011-11-23 17:14:27 +00:00