Tamito Kajiyama e0df491d1e Merged changes in the trunk up to revision 43404. ...

Conflicts resolved:
source/blender/python/SConscript

2012-01-15 23:13:12 +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

Merged changes in the trunk up to revision 43404.

2012-01-15 23:13:12 +00:00

creator.c

Merged changes in the trunk up to revision 43219.

2012-01-08 11:57:53 +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