(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:

- New optional landscape generator (TerraGenesis Perlin)
  - Load heightmaps (either BMP or PNG)
  - Progress dialog while generating worlds (no longer a 'hanging' screen)
  - New dialogs for NewGame, Create Scenario and Play Heightmap
    - Easier to configure your landscape
    - More things to configure (tree-placer, ..)
  - Speedup of world generation
  - New console command 'restart': restart the map EXACTLY as it was when you
      first started it (needs a game made after or with this commit)
  - New console command 'getseed': get the seed of your map and share it with
      others (of course only works with generated maps)
  - Many new, world generation related, things
  - Many internal cleanups and rewrites
  Many tnx to those people who helped making this:
     Belugas, DaleStan, glx, KUDr, RichK67, Rubidium, and TrueLight (alfabetic)
  Many tnx to those who helped testing:
     Arnau, Bjarni, and tokai (alfabetic)
  And to all other people who helped testing and sending comments / bugs
  Stats: 673 lines changed, 3534 new lines, 79 new strings

settings_gui.c

@@ -568,9 +568,8 @@ static const char *_patches_ui[] = {
 	"window_snap_radius",
 	"invisible_trees",
 	"population_in_label",
-	"map_x",
-	"map_y",
 	"link_terraform_toolbar",
+	"progress_update_interval",
 };
 
 static const char *_patches_construction[] = {
@@ -580,6 +579,7 @@ static const char *_patches_construction[] = {
 	"signal_side",
 	"always_small_airport",
 	"drag_signals_density",
+	"oil_refinery_limit",
 };
 
 static const char *_patches_stations[] = {
@@ -600,9 +600,7 @@ static const char *_patches_economy[] = {
 	"multiple_industry_per_town",
 	"same_industry_close",
 	"bribe",
-	"snow_line_height",
 	"colored_news_year",
-	"starting_year",
 	"ending_year",
 	"smooth_economy",
 	"allow_shares",