From: Tim Moore <timoore33@gmail.com>
Date: Sat, 27 Mar 2010 23:34:51 +0000 (+0100)
Subject: Merge branch 'jmt/gps' into next
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=70ebde44881030dee5c372f71f416c84d2fa0ab7;p=flightgear.git

Merge branch 'jmt/gps' into next

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

70ebde44881030dee5c372f71f416c84d2fa0ab7