svn merge ^/trunk/blender -r41230:41266

2011-10-24 23:06:27 +00:00
parent 685b6e7db9 5b6224c847
commit da8a7928c9
73 changed files with 768 additions and 330 deletions
--- a/intern/itasc/ControlledObject.cpp
+++ b/intern/itasc/ControlledObject.cpp
@@ -1,6 +1,7 @@
 /** \file itasc/ControlledObject.cpp
 *  \ingroup itasc
 */
+/*
 * ControlledObject.cpp
 *
 *  Created on: Jan 5, 2009