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)
commita4188f63038107ead1631f0e5150c1cd08e7c5c3
tree6916ae6f47b16d642fb81fef5861940831eb7866
parent2ddb37b98b567291fe6083a1c75b4d54a84a1220
parent9ecc6fdcc719d4e79be92d1ded5d7ac0d20c9416
svn merge ^/trunk/blender -r50138:50143
source/blender/blenkernel/BKE_sequencer.h