[Bf-blender-cvs] [15aead3] soc-2013-paint: Merge branch 'master' into soc-2013-paint

Campbell Barton noreply at git.blender.org
Mon Jul 14 04:03:09 CEST 2014


Commit: 15aead32805468bc966b716e9e788e0644c12d45
Author: Campbell Barton
Date:   Mon Jul 14 12:02:47 2014 +1000
https://developer.blender.org/rB15aead32805468bc966b716e9e788e0644c12d45

Merge branch 'master' into soc-2013-paint

Conflicts:
	source/blender/blenlib/intern/math_vector_inline.c

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



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






More information about the Bf-blender-cvs mailing list