svn merge ^/trunk/blender -r49037:49061
authorCampbell Barton <ideasman42@gmail.com>
Thu, 19 Jul 2012 10:29:39 +0000 (10:29 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 19 Jul 2012 10:29:39 +0000 (10:29 +0000)
1  2 
source/blender/render/intern/source/initrender.c
source/blender/windowmanager/intern/wm_init_exit.c