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)
1  2 
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_sequencer/sequencer_edit.c