svn merge ^/trunk/blender -r50143:50146
authorCampbell Barton <ideasman42@gmail.com>
Thu, 23 Aug 2012 08:54:06 +0000 (08:54 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 23 Aug 2012 08:54:06 +0000 (08:54 +0000)
commit6b09ca6cc108f8f1c3987caa3b5a66f62e4c0f43
tree1b758a53a2f8adddfa29981a2cd3413d9d9ff3fc
parenta4188f63038107ead1631f0e5150c1cd08e7c5c3
parent40db82e31482361a9cda585e3eb396e81859cf31
svn merge ^/trunk/blender -r50143:50146
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_sequencer/sequencer_edit.c