]> git.mxchange.org Git - simgear.git/commit
Merge branch 'timoore/effects'
authorTim Moore <timoore33@gmail.com>
Sun, 20 Dec 2009 15:07:00 +0000 (16:07 +0100)
committerTim Moore <timoore33@gmail.com>
Sun, 20 Dec 2009 15:07:00 +0000 (16:07 +0100)
commitdca07c5634604c18213d08b688e894de354ea335
tree1cec88f1275b0b46ecb883250a252733bc3fb881
parentfd42294faf5fbc3cc9807c98c2b9bc6d32df6173
parent59fc902cfbd3d4532c52373feacbcecb76739309
Merge branch 'timoore/effects'

Conflicts:
simgear/scene/model/model.cxx
simgear/scene/sky/newcloud.cxx
configure.ac
simgear/scene/model/model.cxx
simgear/scene/sky/CloudShaderGeometry.cxx
simgear/scene/sky/newcloud.cxx