merge 16951:17122
authorMartin Poirier <theeth@yahoo.com>
Mon, 20 Oct 2008 00:48:10 +0000 (00:48 +0000)
committerMartin Poirier <theeth@yahoo.com>
Mon, 20 Oct 2008 00:48:10 +0000 (00:48 +0000)
commita806c1eb7f53cca7c65775b7ce849d31c12902f9
treef4554b9212dc021b6f932dd1093a66da30cbef26
parentd16a8649ff6c2b65492a78eab80bcdbefa9dbe9d
parent90721f3f835fca7fed7dce99a2b7b447eba50e26
merge 16951:17122
source/blender/blenloader/intern/readfile.c
source/blender/src/buttons_editing.c