Commit: fe0d6d99b0ae4a3e6f01e92faba01ad088807d51
Author: Julian Eisel
Date: Sun Apr 5 23:42:44 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rBfe0d6d99b0ae4a3e6f01e92faba01ad088807d51
Merge branch 'master' into wiggly-widgets
Conflicts:
source/blender/editors/space_view3d/view3d_ops.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
