Tamito Kajiyama cc3adc2202 Merged changes in the trunk up to revision 43038. ...

Conflicts resolved:
source/blender/makesdna/DNA_material_types.h
source/blenderplayer/bad_level_call_stubs/stubs.c

2011-12-31 21:09:26 +00:00

..

bl_operators

Merged changes in the trunk up to revision 43038.

2011-12-31 21:09:26 +00:00

bl_ui

Merged changes in the trunk up to revision 43038.

2011-12-31 21:09:26 +00:00

keyingsets_builtins.py

renaming BooleanProperty to BoolProperty (rna structs shouldnt affect scripters)

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