Respect min_factory_spacing, rather than using the number "6"
Merge branch 'ncn-devel' of git://github.com/neroden/simutrans.git into 11.x
Merge branch '11.x' into devel-new
FIX: Remove spurious addition of 1 to the level of city buildings when reloading in some cases.
Merge tag 'fix-city-limits-branchpoint' into fix-city-limits
FIX: endless waiting before long block signals direct in front of stations

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@6574 8aca7d54-2c30-db11-9de9-000461428c89
FIX: initialize offsets with dummy values for COLOUR_DEPTH==0

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@6562 8aca7d54-2c30-db11-9de9-000461428c89
FIX crash in image_reader with COLOUR_DEPTH == 0

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@6563 8aca7d54-2c30-db11-9de9-000461428c89
FIX: use delete_node to delete stale besch's

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@6564 8aca7d54-2c30-db11-9de9-000461428c89
FIX: crash building powerline bridge up cliff

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@6547 8aca7d54-2c30-db11-9de9-000461428c89
FIX: no crash on brioken tunnels

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@6556 8aca7d54-2c30-db11-9de9-000461428c89
Debug code for freelist

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@6557 8aca7d54-2c30-db11-9de9-000461428c89

Conflicts:
	dataobj/freelist.cc
	simconst.h
FIX crash on with 64bit pointers

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@6558 8aca7d54-2c30-db11-9de9-000461428c89
Default freelist debugging off again

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@6569 8aca7d54-2c30-db11-9de9-000461428c89
Merge branch 'ncn-devel' into fix-city-limits
Fix problem of disappearing freight correctly.
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...