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)
commitb42fa5da934506ede3731825a7685fb1962e3f1c
treef5dda6733f182dc081560dfcbe7ca56c4b702528
parente6373201987d918c40ccedfbd55d62289ec78494
parentbee2335aa0637396374c2c514993d75cc0696730
COLLADA: merge from trunk -r 24390:24522.
CMakeLists.txt
source/blender/blenkernel/intern/image.c
source/blender/windowmanager/intern/wm_operators.c