[med-svn] [snp-sites] 03/03: Merge branch 'master' of ssh://anonscm.debian.org/git/debian-med/snp-sites

[Steffen Möller]

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

moeller pushed a commit to branch master
in repository snp-sites.

commit f483ad774629fa60f7d05bea64a74d00db8fe5d3
Merge: 3d4306a 8d96dcc
Author: Steffen Moeller <moeller at debian.org>
Date:   Thu Aug 3 16:31:12 2017 +0200

    Merge branch 'master' of ssh://anonscm.debian.org/git/debian-med/snp-sites

 AUTHORS              |  2 +-
 Dockerfile           | 19 +++++++++++++++++++
 LICENSE              |  4 ++++
 VERSION              |  2 +-
 debian/changelog     | 13 +++++++++++++
 debian/control       |  2 +-
 src/alignment-file.c |  2 +-
 src/snp-sites.c      | 14 ++++++++------
 8 files changed, 48 insertions(+), 10 deletions(-)

diff --cc debian/changelog
index b947868,f224c81..f224c81
mode 100755,100644..100755
--- a/debian/changelog
+++ b/debian/changelog
diff --cc debian/control
index dfc8e64,31e1903..31e1903
mode 100755,100644..100755
--- a/debian/control
+++ b/debian/control

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/snp-sites.git