Tamito Kajiyama 7fa096261a Merged changes in the trunk up to revision 52118. ...

Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c

2012-11-12 00:30:55 +00:00

..

freestyle

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

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

modules

New words...

2012-11-07 12:14:35 +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 52118.

2012-11-12 00:30:55 +00:00

templates

minor changes

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