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)
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge