[Bf-blender-cvs] [cb4bfc7] GPencil_EditStrokes: Merge branch 'master' into GPencil_EditStrokes

Joshua Leung noreply at git.blender.org
Sat Nov 29 10:33:41 CET 2014


Commit: cb4bfc74b7cbae1b897747afc1869088e6324b2e
Author: Joshua Leung
Date:   Sat Nov 29 12:29:23 2014 +1300
Branches: GPencil_EditStrokes
https://developer.blender.org/rBcb4bfc74b7cbae1b897747afc1869088e6324b2e

Merge branch 'master' into GPencil_EditStrokes

Conflicts:
	source/blender/editors/gpencil/drawgpencil.c
	source/blender/editors/gpencil/gpencil_ops.c

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



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






More information about the Bf-blender-cvs mailing list