Tamito Kajiyama 3789c398ff Merged changes in the trunk up to revision 34828. ...

Conflicts resolved:
source/blender/makesrna/RNA_enum_types.h

2011-02-13 23:47:30 +00:00

..

freestyle

Made stroke rendering stability fixes, with the aim of addressing

2011-01-31 20:57:39 +00:00

io/netrender

minor python register changes.

2011-02-11 00:11:17 +00:00

keyingsets

- move keyingsets_utils.py into modules.

2011-02-12 08:12:00 +00:00

modules

- move keyingsets_utils.py into modules.

2011-02-12 08:12:00 +00:00

op

Merged changes in the trunk up to revision 34828.

2011-02-13 23:47:30 +00:00

presets

pep8 cleanup

2011-02-04 09:27:25 +00:00

templates

update templates for registration changes

2011-02-12 08:04:32 +00:00

ui

Merged changes in the trunk up to revision 34828.

2011-02-13 23:47:30 +00:00