]> git.mxchange.org Git - flightgear.git/commitdiff
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)
Conflicts:
src/Instrumentation/navradio.cxx

1  2 
src/Instrumentation/navradio.cxx
src/Instrumentation/navradio.hxx

Simple merge
Simple merge