]> git.mxchange.org Git - flightgear.git/commitdiff
projects / flightgear.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4640f5b 40d72b3)
Merge branch 'next' of gitorious.org:fg/flightgear into next
authorDurk Talsma <durktals@gmail.com>
Mon, 3 Oct 2011 18:57:32 +0000 (20:57 +0200)
committerDurk Talsma <durktals@gmail.com>
Mon, 3 Oct 2011 18:57:32 +0000 (20:57 +0200)
1  2 
src/ATC/atc_mgr.cxx patch | diff1 | diff2 | blob | history

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