]> git.mxchange.org Git - flightgear.git/commit
Merge branch 'curt/navradio'
authorTim Moore <timoore@redhat.com>
Wed, 13 Jan 2010 06:37:44 +0000 (07:37 +0100)
committerTim Moore <timoore@redhat.com>
Wed, 13 Jan 2010 06:37:44 +0000 (07:37 +0100)
commitcf9a520a9f404e66cef7fd1955a62127e6d31f93
treec5210a7bb1eca4abab13c0fb529c59d0d6209425
parentffb6b95782f3255900bba0caee0fde1dc9413b3f
parentea281051d8f1d0c97e77cc5320b8b6a0a6ba45be
Merge branch 'curt/navradio'

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