Tamito Kajiyama e91f33101f Merged changes in the trunk up to revision 50956. ...

Conflicts resolved:
source/blender/editors/interface/resources.c

2012-09-30 13:16:55 +00:00

..

freestyle

Fix for the WithinImageBorderUP1D predicate not working with a ViewEdge such that

2012-05-28 23:53:28 +00:00

modules

pep8 cleanup

2012-09-26 21:19:51 +00:00

presets

pep8 cleanup

2012-09-26 21:19:51 +00:00

startup

Merged changes in the trunk up to revision 50956.

2012-09-30 13:16:55 +00:00

templates

correct addon example, it used both __doc__ and bl_description

2012-09-29 11:51:18 +00:00