Tamito Kajiyama e0df491d1e Merged changes in the trunk up to revision 43404. ...

Conflicts resolved:
source/blender/python/SConscript

2012-01-15 23:13:12 +00:00

..

bl_operators

Merged changes in the trunk up to revision 43404.

2012-01-15 23:13:12 +00:00

bl_ui

Merged changes in the trunk up to revision 43404.

2012-01-15 23:13:12 +00:00

keyingsets_builtins.py

renaming BooleanProperty to BoolProperty (rna structs shouldnt affect scripters)

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