COLLADA: merge from trunk -r 24390:24522.
authorArystanbek Dyussenov <arystan.d@gmail.com>
Thu, 12 Nov 2009 14:49:54 +0000 (14:49 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Thu, 12 Nov 2009 14:49:54 +0000 (14:49 +0000)
1  2 
CMakeLists.txt
source/blender/blenkernel/intern/image.c
source/blender/windowmanager/intern/wm_operators.c

diff --cc CMakeLists.txt
Simple merge