svn merge ^/trunk/blender -r49867:49886
authorCampbell Barton <ideasman42@gmail.com>
Tue, 14 Aug 2012 11:07:42 +0000 (11:07 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 14 Aug 2012 11:07:42 +0000 (11:07 +0000)
commitf1537c64a53a1a011e49d0a83e628781e7b4edae
treebeed9492c6b806b4a7b483bcf245d70b93636d1c
parent5c29f5bfcf57a8b48905fa46bbb68b41778b169b
parent9fd6c535cabbcf4ec12c21bc9229c94944bc6c91
svn merge ^/trunk/blender -r49867:49886
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/imbuf/intern/allocimbuf.c
source/blender/windowmanager/intern/wm_init_exit.c