svn merge ^/trunk/blender -r50138:50143
authorCampbell Barton <ideasman42@gmail.com>
Thu, 23 Aug 2012 07:14:53 +0000 (07:14 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 23 Aug 2012 07:14:53 +0000 (07:14 +0000)
1  2 
source/blender/blenkernel/BKE_sequencer.h