merge with trunk (15330 -> 15566)
authorMartin Poirier <theeth@yahoo.com>
Mon, 14 Jul 2008 14:09:36 +0000 (14:09 +0000)
committerMartin Poirier <theeth@yahoo.com>
Mon, 14 Jul 2008 14:09:36 +0000 (14:09 +0000)
1  2 
source/blender/include/BIF_editarmature.h
source/blender/src/buttons_editing.c
source/blender/src/drawview.c
source/blender/src/editarmature.c
source/blender/src/usiblender.c
source/gameengine/Converter/BL_ShapeActionActuator.cpp
source/gameengine/Converter/BL_ShapeDeformer.cpp
source/gameengine/Converter/BL_ShapeDeformer.h

Simple merge
Simple merge
Simple merge
Simple merge
index 58d46d76e5b3df302fe1dd495171161f88cc9f5c,7196b393ed471cafb07dd8ace8eafa6825f552b9..41bf565a4d87a880e0718f9fcc8e713dd21e26fc
@@@ -1,5 -1,5 +1,5 @@@
  /**
--* $Id$
++* $Id:BL_ShapeActionActuator.cpp 15330 2008-06-23 16:37:51Z theeth $
  *
   * ***** BEGIN GPL LICENSE BLOCK *****
   *
index 3ae634905b91df83f70f2e39352cbaed584ac9a4,eb5c1467ea5db0dcd8ea0f144b93f54955ba5030..f2af0d9294ef0c613d57e19396ff4900423d585f
@@@ -1,5 -1,5 +1,5 @@@
  /**
-- * $Id$
++ * $Id:BL_ShapeDeformer.cpp 15330 2008-06-23 16:37:51Z theeth $
   *
   * ***** BEGIN GPL LICENSE BLOCK *****
   *
index 9bbdde3fb2ced8cb624bd1e99bc792f1c3aa1c34,5f0188e3a42e145be2d4c24c1fe817a62bbfeb5b..d3d699b8ddcd33d5924590c13ad78b2ff906e574
@@@ -1,5 -1,5 +1,5 @@@
  /**
-- * $Id$
++ * $Id:BL_ShapeDeformer.h 15330 2008-06-23 16:37:51Z theeth $
   *
   * ***** BEGIN GPL LICENSE BLOCK *****
   *