Tamito Kajiyama 16702c1729 Merged changes in the trunk up to revision 41225. ...

Conflicts resolved:
source/blender/render/intern/source/pipeline.c

2011-10-29 15:46:14 +00:00

..

freestyle

Extended the set of conditions for feature edge selection by edge types.

2011-10-27 20:57:14 +00:00

modules

minor formatting edits (80 char width)

2011-10-23 12:17:24 +00:00

presets

misc edits

2011-10-20 00:19:21 +00:00

startup

Merged changes in the trunk up to revision 41225.

2011-10-29 15:46:14 +00:00

templates

rename user interface operator properties from 'op' to 'props'

2011-10-23 00:53:50 +00:00