Tamito Kajiyama 4e0b1d9177 Merged changes in the trunk up to revision 39368. ...

Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py

2011-08-13 23:29:16 +00:00

..

bl_operators

Merged changes in the trunk up to revision 39368.

2011-08-13 23:29:16 +00:00

bl_ui

Merged changes in the trunk up to revision 39368.

2011-08-13 23:29:16 +00:00

keyingsets_builtins.py

fix for various python bugs and remove unused var.

2011-07-10 17:26:15 +00:00