Merging trunk up to r38167.
authorJoerg Mueller <nexyon@gmail.com>
Wed, 6 Jul 2011 20:26:56 +0000 (20:26 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Wed, 6 Jul 2011 20:26:56 +0000 (20:26 +0000)
commit34c5784f992f64e52f5b07e0f457ec53d9709874
treeedad94020584cc192007960edf17da0957a66c51
parent44220bba7a8f2f09264ea1e581096d65a00579e4
parenta83c3c0b1422713d8553965988c3096955eaa452
Merging trunk up to r38167.
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_sequencer/sequencer_edit.c