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)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/src/buttons_editing.c

Simple merge