]> git.mxchange.org Git - flightgear.git/commitdiff
Merge branch 'releases/2.2.0' into next
authorTim Moore <timoore33@gmail.com>
Tue, 15 Feb 2011 12:26:24 +0000 (13:26 +0100)
committerTim Moore <timoore33@gmail.com>
Tue, 15 Feb 2011 12:26:24 +0000 (13:26 +0100)
Conflicts:
CMakeModules/FindSvnClient.cmake
src/FDM/JSBSim/JSBSim.cxx


Trivial merge