svn merge ^/trunk/blender -r49035:49037
authorCampbell Barton <ideasman42@gmail.com>
Wed, 18 Jul 2012 17:33:27 +0000 (17:33 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 18 Jul 2012 17:33:27 +0000 (17:33 +0000)
1  2 
source/blender/editors/include/UI_interface.h