Conflicts: simgear/scene/model/model.cxx simgear/scene/sky/newcloud.cxx
Changed include of SGQuat.hxx to SGMath.hxx in sound/sample_openal.cxx; somehow this happened in a merge commit when the sound branch was merged to next.
Tim Moore