Commit: 3272c3a7a064afd28ca591268b726f1247c93185
Author: Antony Riakiotakis
Date: Mon Mar 9 12:44:04 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB3272c3a7a064afd28ca591268b726f1247c93185
Merge branch 'wiggly-widgets' into gooseberry
Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
