Merge from trunk 16031:16122
authorIan Thompson <quornian@googlemail.com>
Fri, 15 Aug 2008 00:00:27 +0000 (00:00 +0000)
committerIan Thompson <quornian@googlemail.com>
Fri, 15 Aug 2008 00:00:27 +0000 (00:00 +0000)
commitbda3e4f8e2cfc5de09f7fce9e37acebd9ba11415
treefee5a66971ce4ccce70150f21996f9a02f6ac7eb
parent4cec4803385e6ae3f73cc38a079dad847df05f33
parentfeb5e3a688519316c02e9f2d0e0062d5d3ffa907
Merge from trunk 16031:16122
intern/bmfont/intern/BDF2BMF.py
source/blender/blenkernel/intern/bvhutils.c
source/blender/include/BIF_editarmature.h
source/blender/src/buttons_logic.c
source/blender/src/editarmature.c
source/gameengine/Converter/BL_ShapeActionActuator.cpp
source/gameengine/GameLogic/SCA_ActuatorSensor.cpp