Merge from trunk -r 24758:25003.
authorArystanbek Dyussenov <arystan.d@gmail.com>
Sun, 29 Nov 2009 18:54:37 +0000 (18:54 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Sun, 29 Nov 2009 18:54:37 +0000 (18:54 +0000)
commit71a2cc322286a689e19c4ad069fded3b02d43f38
treeeb10907e08a370fbd0f70075ff19aa825b01c607
parentead79e535d403f3cff00352a9ef0a750afbab30d
parentae16f465738b538964e5f00c1506582d47ead7d1
Merge from trunk -r 24758:25003.
CMakeLists.txt
source/blender/collada/DocumentImporter.cpp
source/blender/windowmanager/intern/wm_operators.c