]> git.mxchange.org Git - flightgear.git/commitdiff
projects / flightgear.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d35b8db 1222e9b)
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)
Conflicts:
src/Instrumentation/gps.cxx
src/Instrumentation/navradio.cxx


Trivial merge
Personal clone of the FlightGear source code, the free-libre OpenSource flight simulator.