Tamito Kajiyama ed0e2fbd9f Merged changes in the trunk up to revision 52690. ...

Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenlib/intern/bpath.c

2012-12-01 02:47:59 +00:00

..

bl_operators

Merged changes in the trunk up to revision 52690.

2012-12-01 02:47:59 +00:00

bl_ui

Merged changes in the trunk up to revision 52690.

2012-12-01 02:47:59 +00:00

keyingsets_builtins.py

style cleanup: pep8

2012-10-08 08:28:05 +00:00