(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

1 files changed, 5 insertions, 0 deletions

diff --git a/Makefile b/Makefile
index 4e03dcdf9..cd155a6f1 100644
--- a/Makefile
+++ b/Makefile
@@ -639,6 +639,7 @@ SRCS += aircraft_gui.c
 SRCS += airport.c
 SRCS += airport_gui.c
 SRCS += aystar.c
+SRCS += bmp.c
 SRCS += bridge_gui.c
 SRCS += bridge_map.c
 SRCS += callback_table.c
@@ -661,9 +662,12 @@ SRCS += engine.c
 SRCS += engine_gui.c
 SRCS += fileio.c
 SRCS += fios.c
+SRCS += genworld.c
+SRCS += genworld_gui.c
 SRCS += gfx.c
 SRCS += gfxinit.c
 SRCS += graph_gui.c
+SRCS += heightmap.c
 SRCS += industry_cmd.c
 SRCS += industry_gui.c
 SRCS += intro_gui.c
@@ -732,6 +736,7 @@ SRCS += strings.c
 SRCS += subsidy_gui.c
 SRCS += terraform_gui.c
 SRCS += texteff.c
+SRCS += tgp.c
 SRCS += thread.c
 SRCS += tile.c
 SRCS += town_cmd.c