From: Tim Moore <timoore33@gmail.com>
Date: Tue, 15 Feb 2011 11:52:03 +0000 (+0100)
Subject: Merge branch 'releases/2.2.0' into next
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=252a539e69bda7cf8cf0c5198f25f38b0a710ee2;p=simgear.git

Merge branch 'releases/2.2.0' into next

Conflicts:
	simgear/scene/model/SGPagedLOD.cxx
---

252a539e69bda7cf8cf0c5198f25f38b0a710ee2