[simutrans] 02/02: merge d/watch

[Jörg Frings-Fürst]

This is an automated email from the git hooks/post-receive script.

jff-guest pushed a commit to branch master
in repository simutrans.

commit 0bb05a17d1d198efda0e491f5ee3f7ab1513b847
Merge: 3158e85 283151d
Author: Jörg Frings-Fürst <debian at jff-webhosting.net>
Date:   Mon Nov 9 15:04:23 2015 +0100

    merge d/watch

 debian/changelog            | 5 +----
 debian/control              | 3 +--
 debian/rules                | 4 +++-
 debian/simutrans.desktop    | 3 ++-
 debian/source/local-options | 2 --
 debian/watch                | 6 +++---
 6 files changed, 10 insertions(+), 13 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/simutrans.git