From: Tim Moore <timoore@redhat.com>
Date: Wed, 13 Jan 2010 06:37:44 +0000 (+0100)
Subject: Merge branch 'curt/navradio'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cf9a520a9f404e66cef7fd1955a62127e6d31f93;p=flightgear.git

Merge branch 'curt/navradio'

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

cf9a520a9f404e66cef7fd1955a62127e6d31f93