Tamito Kajiyama 040f0a1096 Merged changes in the trunk up to revision 35828. ...

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

According to the changes in revision 35667, the Freestyle-related code
in release/scripts/ui/ was moved to release/scripts/startup/bl_ui/.

2011-03-27 23:11:22 +00:00

..

cloth

import bpy needed for presets now

2010-07-08 16:10:14 +00:00

ffmpeg

pep8 cleanup

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

framerate

Adding Framerate preset patch by Troy Sobotka (sobotka). Small change to

2011-01-25 18:30:31 +00:00

interaction

Merged changes in the trunk up to revision 35828.

2011-03-27 23:11:22 +00:00

keyconfig

Merged changes in the trunk up to revision 35828.

2011-03-27 23:11:22 +00:00

render

This fixes HDV render presets:

2010-10-16 19:29:48 +00:00

sss

pep8 cleanup

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

sunsky

import bpy needed for presets now

2010-07-08 16:10:14 +00:00