[Bf-blender-cvs] [3272c3a] gooseberry: Merge branch 'wiggly-widgets' into gooseberry

Antony Riakiotakis noreply at git.blender.org
Mon Mar 9 12:44:56 CET 2015


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

===================================================================



===================================================================






More information about the Bf-blender-cvs mailing list