Tamito Kajiyama 4c36a26af5 Merged changes in the trunk up to revision 45308. ...

Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c

2012-03-31 22:09:43 +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 45308.

2012-03-31 22:09:43 +00:00

creator.c

Merged changes in the trunk up to revision 45308.

2012-03-31 22:09:43 +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