Campbell Barton c00c0134e0 svn merge -r41847:41899 ^/trunk/blender

2011-11-16 03:10:15 +00:00

..

buildinfo.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

CMakeLists.txt

svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build

2011-11-10 04:17:43 +00:00

creator.c

svn merge -r41847:41899 ^/trunk/blender

2011-11-16 03:10:15 +00:00

SConscript

Shuffle some build code around to ensure debug builds on Windows actually run too.

2011-06-08 11:53:07 +00:00