From: Tim Moore <timoore@redhat.com>
Date: Fri, 27 Nov 2009 05:40:47 +0000 (+0100)
Subject: Merge branch 'jmt/gps'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e503591af4f16814d78ded49c5979e273d81a0be;p=flightgear.git

Merge branch 'jmt/gps'

Conflicts:
	src/Instrumentation/gps.cxx
---

e503591af4f16814d78ded49c5979e273d81a0be
diff --cc src/AIModel/AIFlightPlanCreateCruise.cxx
index 4f44ab1e2,d20a2134b..d20a2134b
mode 100644,100755..100644
--- a/src/AIModel/AIFlightPlanCreateCruise.cxx
+++ b/src/AIModel/AIFlightPlanCreateCruise.cxx