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

..

blender

Merged changes in the trunk up to revision 53584.

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

blenderplayer

Merged changes in the trunk up to revision 53584.

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

creator

Merged changes in the trunk up to revision 53584.

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

gameengine

BGE: Fix for [#33769] "Material friction settings are ignored" reported by Alex Fraser (z0r).

2013-01-05 08:53:39 +00:00

icons

Added GPL header to sconscripts!

2012-12-17 08:01:43 +00:00

tests

add ".hh" as an extension for source scripts.

2012-12-31 07:06:51 +00:00

CMakeLists.txt

…

SConscript

Added GPL header to sconscripts!

2012-12-17 08:01:43 +00:00