Merge branch 'next' into durk-atc

author Durk Talsma <durk@localhost.(none)>

Fri, 1 Jul 2011 20:20:40 +0000 (22:20 +0200)

committer Durk Talsma <durk@localhost.(none)>

Fri, 1 Jul 2011 20:20:40 +0000 (22:20 +0200)
author Durk Talsma <durk@localhost.(none)>
Fri, 1 Jul 2011 20:20:40 +0000 (22:20 +0200)
committer Durk Talsma <durk@localhost.(none)>
Fri, 1 Jul 2011 20:20:40 +0000 (22:20 +0200)
diff --cc src/AIModel/AIAircraft.cxx
Simple merge
diff --cc src/AIModel/AIBase.hxx
Simple merge
diff --cc src/Scenery/tilemgr.cxx
Simple merge
diff --cc src/Traffic/SchedFlight.cxx
Simple merge
author	Durk Talsma <durk@localhost.(none)>
	Fri, 1 Jul 2011 20:20:40 +0000 (22:20 +0200)
committer	Durk Talsma <durk@localhost.(none)>
	Fri, 1 Jul 2011 20:20:40 +0000 (22:20 +0200)
		1	2
src/AIModel/AIAircraft.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/AIModel/AIBase.hxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/Scenery/tilemgr.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/Traffic/SchedFlight.cxx	patch \|	diff1 \|	diff2 \|	blob \| history