]> git.mxchange.org Git - flightgear.git/commitdiff
projects / flightgear.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2229af9 1c7278b)
Merge branch 'jmt/gps' into next
authorTim Moore <timoore33@gmail.com>
Sun, 28 Mar 2010 13:32:59 +0000 (15:32 +0200)
committerTim Moore <timoore33@gmail.com>
Sun, 28 Mar 2010 13:32:59 +0000 (15:32 +0200)
Conflicts:
src/Instrumentation/navradio.cxx


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