Tamito Kajiyama 831f339980 Merged changes in the trunk up to revision 43748. ...

Conflicts resolved:
source/blender/editors/include/UI_resources.h

2012-01-29 12:00:04 +00:00

..

freestyle

Added two stroke geometry modifiers:

2012-01-04 00:23:34 +00:00

modules

cleanup for redefined vars

2012-01-18 06:55:51 +00:00

presets

Color channels used for tracking is now a part of default tracking settings and also a part of presets.

2012-01-26 15:33:16 +00:00

startup

Merged changes in the trunk up to revision 43748.

2012-01-29 12:00:04 +00:00

templates

remove api from addon bl_info, was never used.

2012-01-14 13:02:20 +00:00