svn merge -r38000:38200 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jul 2011 17:51:30 +0000 (17:51 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jul 2011 17:51:30 +0000 (17:51 +0000)
commitcadfac5a0f54c2e7086a6c1cf93f90adcbd1b7bb
tree5ac97cdf4b8b6e5a829448ad7de34c59e7c35053
parentcc0abf99632064f9daba60be8867f2addd28b9e8
parent99736f373c12e7ab91f962c738243bddf2d713c6
svn merge -r38000:38200 https://svn.blender.org/svnroot/bf-blender/trunk/blender
18 files changed:
intern/ghost/test/CMakeLists.txt
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/BME_tools.c
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenlib/intern/math_geom.c
source/blender/editors/curve/editcurve.c
source/blender/editors/object/object_modifier.c
source/blender/editors/object/object_relations.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_manipulator.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blenderplayer/CMakeLists.txt
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt