Tamito Kajiyama efc4341ee4 Merged changes in the trunk up to revision 42556. ...

Conflicts resolved:
source/blender/editors/space_view3d/drawobject.c

2011-12-10 20:54:43 +00:00

..

bl_operators

Merged changes in the trunk up to revision 42556.

2011-12-10 20:54:43 +00:00

bl_ui

Merged changes in the trunk up to revision 42556.

2011-12-10 20:54:43 +00:00

keyingsets_builtins.py

renaming BooleanProperty to BoolProperty (rna structs shouldnt affect scripters)

2011-12-01 22:08:42 +00:00