Merge branch 'next' into durk-atc

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

Sun, 24 Jul 2011 06:44:22 +0000 (08:44 +0200)

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

Sun, 24 Jul 2011 06:44:22 +0000 (08:44 +0200)
author Durk Talsma <durk@localhost.(none)>
Sun, 24 Jul 2011 06:44:22 +0000 (08:44 +0200)
committer Durk Talsma <durk@localhost.(none)>
Sun, 24 Jul 2011 06:44:22 +0000 (08:44 +0200)
diff --cc src/Main/fg_init.cxx
Simple merge
diff --cc src/Scenery/tilemgr.cxx
Simple merge
diff --cc src/Traffic/Schedule.cxx
Simple merge
author	Durk Talsma <durk@localhost.(none)>
	Sun, 24 Jul 2011 06:44:22 +0000 (08:44 +0200)
committer	Durk Talsma <durk@localhost.(none)>
	Sun, 24 Jul 2011 06:44:22 +0000 (08:44 +0200)
		1	2
src/Main/fg_init.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/Scenery/tilemgr.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/Traffic/Schedule.cxx	patch \|	diff1 \|	diff2 \|	blob \| history