Tamito Kajiyama 6cee7bb2b7 Merged changes in the trunk up to revision 52191. ...

Conflicts resolved:
source/blender/makesdna/DNA_scene_types.h

2012-11-14 02:01:02 +00:00

..

freestyle

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

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

modules

Removing again windows' long_locales! :p

2012-11-13 06:29:46 +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 52191.

2012-11-14 02:01:02 +00:00

templates

minor changes

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