]> git.mxchange.org Git - flightgear.git/commit
Merge branch 'next' into durk-atc
authorDurk Talsma <durk@localhost.(none)>
Fri, 3 Jun 2011 07:31:04 +0000 (09:31 +0200)
committerDurk Talsma <durk@localhost.(none)>
Fri, 3 Jun 2011 07:31:04 +0000 (09:31 +0200)
commit348ff2ec23298db4db3b3f2b12d301dec73ec8e1
tree31b88b3ff2bb0727e07ea75279396e8b056379f7
parent63708fb0df81a357173499d0c1950525f387db44
parentd5f81f0eacfb8ab5f7a7767716454a12e687ce6d
Merge branch 'next' into durk-atc
Merge with next.
Conflicts:
src/Airports/dynamics.cxx
src/Airports/dynamics.hxx
src/ATC/trafficcontrol.cxx
src/Airports/dynamics.cxx
src/Airports/dynamics.hxx