Merge tag 'fix-city-limits-branchpoint' into fix-city-limits
Merge branch 'ncn-devel' into fix-city-limits
Fix problem of disappearing freight correctly.
Merge branch 'ncn-devel' into fix-city-limits
Avoid remarking city tiles repeatedly during loading.  Reset city borders when appropriate.  Fix nasty bug induced by use of the FOR macro, which is defective under optimization.
Remove debugging code inserted during last commit; we appear to have fixed the bug...
Merge branch '11.x' into devel-new
Merge branch 'fix-city-limits' of git://github.com/neroden/simutrans.git into devel-new
Cities were not adopting player-built roads... make them do so.  (Bug reintroduced by James.)
Disallow construction of roads without sidewalks adopted by city.  (A more careful city road adoption rule will have to await better-defined city ownership.)
Attempt to get slightly more consistent city road adoption behavior, for now.
Fix nasty logic error which prevented deletion of elevated roads and tunnels.
Merge branch '11.x' into devel-new

Conflicts:
	simversion.h
Merge branch 'fix-city-limits' of git://github.com/neroden/simutrans.git into devel-new
CHANGE: Cities will only adopt/add pavements ("sidewalks") to roads which abut city buildings.
Merge branch 'devel-new' into passenger-generation

Conflicts:
	simcity.cc
CHANGE: Add residential buildings as a target for visitors, but at 1/20th the rate based on their level.