Tamito Kajiyama 68ae82bb47 Merged changes in the trunk up to revision 43585. ...

Conflicts resolved:
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c

2012-01-21 23:01:25 +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

remove *.select_inverse operators where the *.select_all operator has an invert option.

2012-01-14 06:58:03 +00:00

startup

Merged changes in the trunk up to revision 43585.

2012-01-21 23:01:25 +00:00

templates

remove api from addon bl_info, was never used.

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