svn merge -r39384:39433 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 16 Aug 2011 06:53:03 +0000 (06:53 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 16 Aug 2011 06:53:03 +0000 (06:53 +0000)
commit74ca6070b48fb141f46a3c5a5f4ff67ef9105a04
tree76209a44ca9da928855d7e73941d1585895775a1
parent55a560c0c4578de7d7378fdc3a3f533adce05b8c
parent405218df6fa57794d8d7d932eeb6c92f94aff0bc
svn merge -r39384:39433 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenlib/BLI_utildefines.h
source/blender/blenlib/intern/BLI_ghash.c
source/blender/editors/object/object_edit.c
source/blender/makesrna/intern/rna_object.c