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)
commit9c98258ab08b48420c86cf09c0f6ba9d1ff82700
tree1965901c6efadb4c9f71b374ed80af81845fba92
parentdf370549c37104df1d3369f360d8234c9add1578
parentc5366cceb6d345d3526ab013b04eb815fe0a6845
Merge branch 'releases/2.2.0' into next

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