merge 17122:17206
authorMartin Poirier <theeth@yahoo.com>
Tue, 28 Oct 2008 18:47:01 +0000 (18:47 +0000)
committerMartin Poirier <theeth@yahoo.com>
Tue, 28 Oct 2008 18:47:01 +0000 (18:47 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/src/buttons_editing.c
source/blender/src/editarmature.c

Simple merge
Simple merge