blender/release
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
..
bin A big cleaning patch by Bastien Montagne (thanks a lot!) 2012-12-11 22:00:22 +00:00
darwin set line endings to native & mime type to text/plain for .app/Contents/MacOS/xxx files. 2012-12-29 03:19:30 +00:00
datafiles Merged changes in the trunk up to revision 53584. 2013-01-05 22:24:05 +00:00
freedesktop patch to our desktop file from debian, German translation. 2012-04-16 09:56:12 +00:00
scripts Merged changes in the trunk up to revision 53584. 2013-01-05 22:24:05 +00:00
text Readme and Release Log Links: 2012-11-20 01:55:22 +00:00
windows style cleanup 2012-10-20 18:46:57 +00:00
environment-macosx
environment-mswindows
environment-unix