Tamito Kajiyama 9c42afb1c0 Merged changes in the trunk up to revision 40413. ...

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

2011-09-20 21:22:15 +00:00

..

freestyle

Rearranged the organization of chaining options in line styles.

2011-09-19 23:24:14 +00:00

modules

/release/scripts: Removed final points in UI strings and messages.

2011-09-19 14:00:42 +00:00

presets

svn merge -r 37306:39975 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-07 15:34:04 +00:00

startup

Merged changes in the trunk up to revision 40413.

2011-09-20 21:22:15 +00:00

templates

i18n: more clean-up

2011-09-19 15:28:43 +00:00