Sunday merger of orange branch with bf-blender
authorTon Roosendaal <ton@blender.org>
Sun, 11 Dec 2005 23:04:27 +0000 (23:04 +0000)
committerTon Roosendaal <ton@blender.org>
Sun, 11 Dec 2005 23:04:27 +0000 (23:04 +0000)
1  2 
source/blender/render/intern/source/rendercore.c
source/blender/src/buttons_editing.c
source/blender/src/outliner.c

Simple merge
Simple merge