Commit: 1103abdb86c0edc7e304347861a30fbc8a670c3d
Author: Antony Riakiotakis
Date: Fri Nov 14 15:36:24 2014 +0100
Branches: gooseberry
https://developer.blender.org/rB1103abdb86c0edc7e304347861a30fbc8a670c3d
Merge branch 'terrible_consequencer' into gooseberry
Conflicts:
source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
