From: Tim Moore <timoore33@gmail.com>
Date: Sun, 28 Mar 2010 13:32:59 +0000 (+0200)
Subject: Merge branch 'jmt/gps' into next
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ebdeb3eed386199d9d54f819ba3c472b501ae6f7;p=flightgear.git

Merge branch 'jmt/gps' into next

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

ebdeb3eed386199d9d54f819ba3c472b501ae6f7