svn merge ^/trunk/blender -r43887:43918
authorCampbell Barton <ideasman42@gmail.com>
Sun, 5 Feb 2012 22:13:10 +0000 (22:13 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 5 Feb 2012 22:13:10 +0000 (22:13 +0000)
commit3937ec7d11996438c2c6bd65d1d88f72431b1d52
treee0a2104d51f1a44de88047a0e9d17d8492b343b1
parent11d5a2d2eba127e2f8502e570addb08c22cbb9c1
parent8f3170a17c270dd8a02f9b3bf2a971a65cab67ae
svn merge ^/trunk/blender -r43887:43918
release/scripts/startup/bl_ui/space_info.py
source/blender/blenkernel/BKE_blender.h
source/blender/editors/curve/editcurve.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/makesrna/intern/rna_mesh.c
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp