[Bf-blender-cvs] [0fd7310] UI-experiments: Merge branch 'wiggly-widgets' into UI-experiments

[Julian Eisel]

Commit: 0fd7310b5133aa57a4307c4cb19e44531d723ec1
Author: Julian Eisel
Date:   Thu Oct 22 19:25:02 2015 +0200
Branches: UI-experiments
https://developer.blender.org/rB0fd7310b5133aa57a4307c4cb19e44531d723ec1

Merge branch 'wiggly-widgets' into UI-experiments

Conflicts:
	source/blender/blenkernel/intern/customdata.c
	source/blender/blenloader/intern/versioning_270.c
	source/blender/editors/interface/resources.c
	source/blender/editors/transform/transform_manipulator.c

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



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