Merging trunk 17342:17457
authorMartin Poirier <theeth@yahoo.com>
Fri, 14 Nov 2008 16:09:23 +0000 (16:09 +0000)
committerMartin Poirier <theeth@yahoo.com>
Fri, 14 Nov 2008 16:09:23 +0000 (16:09 +0000)
commit6eda50f8d978cfd565c6abf9645e88268a61e89b
treeecb300db605ebba58d238bfae9c1a7ce2ff55f20
parent59ac45dd12ca5a177318815f9396cd6b97cea766
parent7cce946de708d697e3131676cc94507f4421e07b
Merging trunk 17342:17457
source/blender/blenloader/intern/readfile.c
source/blender/include/BIF_editarmature.h
source/blender/src/buttons_editing.c
source/blender/src/gpencil.c