svn merge -r37800:37900 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jul 2011 14:54:29 +0000 (14:54 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jul 2011 14:54:29 +0000 (14:54 +0000)
commit619927605355a0b66e1ecd8f8a8bf1fe31b68d07
tree384a5b47f09aeeb30f984216e0aae6aeb68c2e0f
parent2dc6b8f835b87480a9451c91e684271a55554006
parent3c43e8e50ac991b082c143c634e4776aaca02db1
svn merge -r37800:37900 https://svn.blender.org/svnroot/bf-blender/trunk/blender
12 files changed:
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/blender.c
source/blender/blenlib/BLI_math_geom.h
source/blender/blenlib/intern/math_geom.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/armature/editarmature.c
source/blender/editors/object/object_bake.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_info/info_stats.c
source/blender/editors/uvedit/uvedit_draw.c
source/blender/gpu/intern/gpu_buffers.c
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp