svn merge ^/trunk/blender -r47272:47306
authorCampbell Barton <ideasman42@gmail.com>
Fri, 1 Jun 2012 05:50:17 +0000 (05:50 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 1 Jun 2012 05:50:17 +0000 (05:50 +0000)
1  2 
release/scripts/modules/bpy_extras/keyconfig_utils.py
source/blender/compositor/CMakeLists.txt
source/blender/editors/transform/transform.c