]> git.mxchange.org Git - flightgear.git/commit
Merge branch 'jmt/gps' into next
authorTim Moore <timoore33@gmail.com>
Sat, 27 Mar 2010 23:34:51 +0000 (00:34 +0100)
committerTim Moore <timoore33@gmail.com>
Sat, 27 Mar 2010 23:34:51 +0000 (00:34 +0100)
commit70ebde44881030dee5c372f71f416c84d2fa0ab7
treef7701796234f552b753b156c01c07ad1563a4025
parent37d3cf7fbb69f7d5e19375dc41d4402eee4a6387
parent4e24fbbb91cbb1ef94e0a50cc3aa061648bab2d4
Merge branch 'jmt/gps' into next

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