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)
1  2 
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