merge runk 16887:16950
authorMartin Poirier <theeth@yahoo.com>
Mon, 6 Oct 2008 17:37:03 +0000 (17:37 +0000)
committerMartin Poirier <theeth@yahoo.com>
Mon, 6 Oct 2008 17:37:03 +0000 (17:37 +0000)
commitd16a8649ff6c2b65492a78eab80bcdbefa9dbe9d
tree5d2a2bd518cc7de908ad516a28ee8011d9a7e590
parent1513e96857538a5a686439247c0608bd1dfce64a
parentde6a9d0194abacb1bd2de5283e72440b4916325c
merge runk 16887:16950
source/blender/blenloader/intern/readfile.c
source/blender/src/autoarmature.c
source/blender/src/buttons_editing.c
source/blender/src/drawview.c
source/blender/src/usiblender.c