From: Tim Moore <timoore33@gmail.com>
Date: Tue, 15 Feb 2011 12:26:24 +0000 (+0100)
Subject: Merge branch 'releases/2.2.0' into next
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9c98258ab08b48420c86cf09c0f6ba9d1ff82700;p=flightgear.git

Merge branch 'releases/2.2.0' into next

Conflicts:
	CMakeModules/FindSvnClient.cmake
	src/FDM/JSBSim/JSBSim.cxx
---

9c98258ab08b48420c86cf09c0f6ba9d1ff82700