]> git.mxchange.org Git - flightgear.git/commit
Merge branch 'jmt/gps'
authorTim Moore <timoore@redhat.com>
Fri, 27 Nov 2009 05:40:47 +0000 (06:40 +0100)
committerTim Moore <timoore@redhat.com>
Fri, 27 Nov 2009 05:40:47 +0000 (06:40 +0100)
commite503591af4f16814d78ded49c5979e273d81a0be
treece45757a89732d48df9e2af2a32cc4ebb559dc68
parent8933486a564f84d4a64008dca2a800396a6fc684
parentf11572cd646e3e6066eb42e4382ce4ffd89b69fe
Merge branch 'jmt/gps'

Conflicts:
src/Instrumentation/gps.cxx
src/AIModel/AIFlightPlanCreateCruise.cxx
src/Airports/simple.cxx
src/Cockpit/hud.cxx
src/Environment/environment_ctrl.cxx
src/Instrumentation/navradio.cxx
src/Instrumentation/navradio.hxx