merging trunk 15964 -> 16116
authorMartin Poirier <theeth@yahoo.com>
Thu, 14 Aug 2008 21:16:48 +0000 (21:16 +0000)
committerMartin Poirier <theeth@yahoo.com>
Thu, 14 Aug 2008 21:16:48 +0000 (21:16 +0000)
commitdb42038bcf4373da6c06d936cf268fa90a90a2f4
tree35488e1c40cf040a4591b58bb73e75004134a552
parent715ca7cbf6d4b6b26a3ecf65de24bda64b1f1709
parent47c2271d673173ee93b9d91926de9ea41415d411
merging trunk 15964 -> 16116
source/blender/include/BIF_editarmature.h
source/blender/include/butspace.h
source/blender/src/buttons_editing.c
source/blender/src/editarmature.c
source/gameengine/Converter/BL_ShapeActionActuator.cpp
source/gameengine/GameLogic/SCA_ActuatorSensor.cpp