MERGING TRUNK
authorMartin Poirier <theeth@yahoo.com>
Mon, 23 Jun 2008 16:37:51 +0000 (16:37 +0000)
committerMartin Poirier <theeth@yahoo.com>
Mon, 23 Jun 2008 16:37:51 +0000 (16:37 +0000)
commit488fa13fc04ff4ed55c89914df5c3631697f61dd
treecd536d82030229291e590bd7b7c661872699ac74
parent39a7a2483875d75db29e5fb05aa123e009094957
parent75e22a1917fb638a67d475b224cb6e368e821783
MERGING TRUNK
source/blender/include/butspace.h
source/blender/makesdna/DNA_scene_types.h
source/blender/src/buttons_editing.c
source/blender/src/drawview.c
source/blender/src/editarmature.c
source/blender/src/usiblender.c