Tamito Kajiyama b7cd9ec3ad Merged changes in the trunk up to revision 52340. ...

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

2012-11-19 00:41:11 +00:00

..

freestyle

Fix for dashed line options not working as expected in some applications

2012-11-04 23:52:26 +00:00

modules

style cleanup: comments & spelling

2012-11-18 01:22:31 +00:00

presets

Fix #32780: Maya keymap selection issues

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

startup

Merged changes in the trunk up to revision 52340.

2012-11-19 00:41:11 +00:00

templates

minor changes

2012-10-17 16:10:04 +00:00