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)
commitf2b354d9cbdcac4650f4837bafb147a7a306395e
tree7c1c280ba9a75d093fd3bf212f02ef38f43cb50a
parent4640f5bb025f2466184083803a31dc0b742f3d9c
parent40d72b3ba752275feafe298b27f8fbf727b3e036
Merge branch 'next' of gitorious.org:fg/flightgear into next
src/ATC/atc_mgr.cxx