From: Tim Moore <timoore33@gmail.com>
Date: Wed, 5 May 2010 14:55:25 +0000 (+0200)
Subject: Merge branch 'jmt/gps'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8f056da61884b14e37ec92e52c4e5823a50d30e5;p=flightgear.git

Merge branch 'jmt/gps'

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

8f056da61884b14e37ec92e52c4e5823a50d30e5