[med-svn] [jellyfish] 02/10: Merge tag 'upstream/2.2.6'

[Andreas Tille]

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

tille pushed a commit to branch master
in repository jellyfish.

commit 3fe277860d9e2f636706ab3d602046da812ba714
Merge: 035e3b1 7784a23
Author: Andreas Tille <tille at debian.org>
Date:   Tue Aug 30 13:36:04 2016 +0200

    Merge tag 'upstream/2.2.6'
    
    Upstream version 2.2.6

 configure.ac                                    | 2 +-
 include/jellyfish/rectangular_binary_matrix.hpp | 5 +++--
 jellyfish/merge_files.cc                        | 6 +++---
 sub_commands/count_main.cc                      | 2 +-
 swig/Makefile.am                                | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

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