]> git.mxchange.org Git - flightgear.git/commit
Merge branch 'jmt/gps'
authorTim Moore <timoore33@gmail.com>
Wed, 5 May 2010 14:55:25 +0000 (16:55 +0200)
committerTim Moore <timoore33@gmail.com>
Wed, 5 May 2010 14:55:25 +0000 (16:55 +0200)
commit8f056da61884b14e37ec92e52c4e5823a50d30e5
tree05b87ad503fb2e18d1244a8304b1525b112fdcd9
parentd35b8db13f7aceee46d63b061cd20e6d3968f92a
parent1222e9b09476da09d3a3666a7c0d542b523b579d
Merge branch 'jmt/gps'

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