Tamito Kajiyama 4172997675 Merged changes in the trunk up to revision 50607. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c

2012-09-15 00:15:24 +00:00

..

bl_operators

Merged changes in the trunk up to revision 50607.

2012-09-15 00:15:24 +00:00

bl_ui

Merged changes in the trunk up to revision 50607.

2012-09-15 00:15:24 +00:00

keyingsets_builtins.py

don't have spaces in idnames, confuses py types:

2012-04-26 18:07:15 +00:00