Tamito Kajiyama cdbfd1db38 Merged changes in the trunk up to revision 45820. ...

Conflicts resolved:
source/creator/creator.c

2012-04-21 00:33:36 +00:00

..

bl_operators

Merged changes in the trunk up to revision 45820.

2012-04-21 00:33:36 +00:00

bl_ui

Merged changes in the trunk up to revision 45820.

2012-04-21 00:33:36 +00:00

keyingsets_builtins.py

Tweaks for typos in the Keying Set descriptions commit

2012-03-09 10:24:53 +00:00