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)
commit371e259a0b6fd7b0cea6542e9077b4f6bc84d39d
treef9f51f3b59dee92b59f812eb7cc7d5256574bf27
parentbccc6b12b5f6b2df2dea394a746df436bbe5dd85
parent9c8edae7d4ef799b19f6487feb21ce7fbcf5ee07
svn merge ^/trunk/blender -r49037:49061
source/blender/render/intern/source/initrender.c
source/blender/windowmanager/intern/wm_init_exit.c