]> git.mxchange.org Git - flightgear.git/commit
projects / flightgear.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: de1564d f1a3ced)
Merge branch 'next' into durk-atc
authorDurk Talsma <durk@localhost.(none)>
Wed, 1 Jun 2011 18:46:34 +0000 (20:46 +0200)
committerDurk Talsma <durk@localhost.(none)>
Wed, 1 Jun 2011 18:46:34 +0000 (20:46 +0200)
commitf9a5f921a4853f7e64d467d63e19acf8f6f84979
tree85c444cb77ae9b47ab12f92eb9fe77ccbc0fe560tree | snapshot
parentde1564d83e32cf077a5367cc838f28271dd79381commit | diff
parentf1a3cedb2fc0098514914275f4a4dcf5fbc966bfcommit | diff
Merge branch 'next' into durk-atc
Resolving merge conflicts indicated below.
Conflicts:
src/ATC/CMakeLists.txt
src/ATC/Makefile.am
src/Main/fg_init.cxx
src/ATC/CMakeLists.txt diff1 | diff2 | blob | history
src/ATC/Makefile.am diff1 | diff2 | blob | history
src/ATCDCL/ATCDialog.cxx diff1 | diff2 | blob | history
src/Main/fg_init.cxx diff1 | diff2 | blob | history
Personal clone of the FlightGear source code, the free-libre OpenSource flight simulator.