(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, 2 insertions, 2 deletions

diff --git a/os/macosx/splash.c b/os/macosx/splash.c
index 351aa9e0b..e09b8fccb 100644
--- a/os/macosx/splash.c
+++ b/os/macosx/splash.c
@@ -137,8 +137,8 @@ void DisplaySplashImage(void)
 
 
 
-#else // WITH_PNG
+#else /* WITH_PNG */
 
 void DisplaySplashImage(void) {}
 
-#endif // WITH_PNG
+#endif /* WITH_PNG */