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)
commit025e4b046a527cdb58bccbccdec2f26d3973336c
treedbd3d6b68c75fa332a39f1eec628e044ece84d16
parentd1e90606c799d75fd3782a225b1f154918fc0fe7
parent705a248c75467ef67eba1cda124fd5375eb4666f
merge 17122:17206
source/blender/blenloader/intern/readfile.c
source/blender/src/buttons_editing.c
source/blender/src/editarmature.c