[med-svn] [mash] 02/05: Merge tag 'upstream/1.1.1'

[Sascha Steinbiss]

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

satta pushed a commit to branch master
in repository mash.

commit 46292ebc9e3d399128f5b3619c90775616c56e19
Merge: 563d8cb 9aed75a
Author: Sascha Steinbiss <satta at debian.org>
Date:   Sat Aug 27 08:04:42 2016 +0000

    Merge tag 'upstream/1.1.1'
    
    Upstream version 1.1.1

 Makefile.in                       |  2 +-
 doc/sphinx/index.rst              |  7 +--
 doc/sphinx/tutorials.rst          | 18 +++++--
 src/mash/Command.cpp              | 17 ++++---
 src/mash/CommandFind.cpp          | 18 ++++---
 src/mash/CommandInfo.cpp          | 98 +++++++++++++++++++++++++++++++++++++--
 src/mash/CommandInfo.h            |  1 +
 src/mash/Sketch.cpp               | 47 +++++++------------
 src/mash/Sketch.h                 |  3 +-
 src/mash/hash.cpp                 |  2 +-
 src/mash/mash.cpp                 |  3 ++
 src/mash/sketchParameterSetup.cpp |  7 ++-
 src/mash/version.h                |  2 +-
 13 files changed, 163 insertions(+), 62 deletions(-)

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