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

1  2 
src/Instrumentation/navradio.cxx patch | diff1 | diff2 | blob | history

diff --cc src/Instrumentation/navradio.cxx
Simple merge
Personal clone of the FlightGear source code, the free-libre OpenSource flight simulator.