svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22935:23022
authorCampbell Barton <ideasman42@gmail.com>
Mon, 7 Sep 2009 08:31:03 +0000 (08:31 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 7 Sep 2009 08:31:03 +0000 (08:31 +0000)
commitd779410600de3061539c8c433c7a8c72cff022c0
tree516539b2ca6aafb56121e2d1f2f23eca8c950763
parentf5e80e7a80feb4b516792b961c2310210536aef8
parent3b743ac5565663d2fd0be4bbbc92e404afafbce4
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22935:23022
looks like 2 merges are needed to skip a commit.
source/blender/blenkernel/intern/curve.c
source/blender/blenlib/BLI_arithb.h
source/blender/blenlib/intern/arithb.c
source/blender/makesdna/DNA_curve_types.h