svn merge -r37793:37865 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Mon, 18 Jul 2011 14:15:02 +0000 (14:15 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 18 Jul 2011 14:15:02 +0000 (14:15 +0000)
commitb8fc3030b531702b6d1ac8af442e593e4f3ce9fa
tree31c0a25691cce25b55eadaa358e03e666e6b73b0
parent882e29650582f46efde115c1d45c1faec7a169fc
parente1b060486f0a315cc60c60be07783ab89056229d
svn merge -r37793:37865 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Merge info was  /trunk/blender:36835-37793,37865-38157
so this should merge in missing files.
CMakeLists.txt
intern/ghost/intern/GHOST_SystemCocoa.mm
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/intern/paint.c
source/blender/blenlib/intern/math_geom.c
source/blender/editors/armature/armature_ops.c
source/blender/editors/armature/editarmature.c
source/blender/editors/mesh/editmesh_mods.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/python/generic/mathutils_geometry.c