Tamito Kajiyama feccbaabbd Merged changes in the trunk up to revision 53584. ...

Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/RNA_enum_types.h

Also made additional code updates for:
r53355 UIList - Python-extendable list of UI items
r53460 Alpha premul pipeline cleanup

2013-01-05 22:24:05 +00:00

..

bad_level_call_stubs

Merged changes in the trunk up to revision 53584.

2013-01-05 22:24:05 +00:00

CMakeLists.txt

Import the RangeTree library into extern

2012-12-30 18:20:52 +00:00