[SCM] transportation simulator branch, master, updated. upstream/100.0-19-gb94015f

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit b94015fa717980c6f539c74aa1a4e63eb78c57c5
Author: Ansgar Burchardt <ansgar at 2008.43-1.org>
Date:   Mon Jun 30 18:58:40 2008 +0200

    remove unneeded Conflicts

diff --git a/debian/control b/debian/control
index c5bd5e8..e8cc867 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-games/simutrans.git
 Package: simutrans
 Architecture: any
 Depends: simutrans-pak64 (>= 100.0), simutrans-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: simutrans-pak64 (< 100.0)
 Description: transportation simulator
  Simutrans is a free transportation simulator: The player operates a
  transportation company and has to transport goods and passengers between

-- 
transportation simulator