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)
commitbccc6b12b5f6b2df2dea394a746df436bbe5dd85
tree7912e8e37c50e78469aa1f0819b0051630ba1b11
parent9d79d2bee8f7b3ec3d947e02c50f1efcd6eaeb22
parent64234612479f02ed38deca2395a4c0ba4a2ee94a
svn merge ^/trunk/blender -r49035:49037
source/blender/editors/include/UI_interface.h