Cycles: fix merge problem with startup.blend
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 23 Jun 2011 10:33:15 +0000 (10:33 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 23 Jun 2011 10:33:15 +0000 (10:33 +0000)
commit0a4a36271f13bbbc5c6db2060206731033b84bf0
tree1cad156198bd064a775790021d9e7cbaa2f35cde
parent07dee0d8a627f1820c67203e938ad6a611825cd2
Cycles: fix merge problem with startup.blend
source/blender/editors/datafiles/startup.blend.c