]> git.mxchange.org Git - flightgear.git/commit
Merge branch 'durk/atcdcl-cond'
authorTim Moore <timoore33@gmail.com>
Tue, 9 Feb 2010 23:45:06 +0000 (00:45 +0100)
committerTim Moore <timoore33@gmail.com>
Tue, 9 Feb 2010 23:45:06 +0000 (00:45 +0100)
commit988a6771aaf6657ed02e24d32a286e943386857b
treea93865ee2dee1e16622300512e3a36c89fb298dc
parent992b7ca8f4e58494b0bbc5ef7e228c65879ba0e8
parent546d3e265d7d3678c89c9125326a18487e43f5a7
Merge branch 'durk/atcdcl-cond'

Conflicts:
src/ATC/trafficcontrol.cxx
src/Main/Makefile.am
configure.ac
src/ATC/trafficcontrol.cxx
src/ATC/trafficcontrol.hxx
src/Airports/groundnetwork.cxx
src/Main/Makefile.am
src/Main/fg_init.cxx