[med-svn] [jellyfish] 03/06: Merge tag 'upstream/1.1.11'

[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 9c353907a60b88cedb9f4496f759f0baf811fb23
Merge: e95b305 e7fb264
Author: Andreas Tille <tille at debian.org>
Date:   Fri Mar 21 11:32:23 2014 +0100

    Merge tag 'upstream/1.1.11'
    
    Upstream version 1.1.11

 aclocal.m4                        |   4 +-
 config.h.in                       |   3 +
 config.sub                        |  11 +-
 configure                         | 599 +++++++++++++++++++++++---------------
 configure.ac                      |  15 +-
 jellyfish/cite.cc                 |   3 +-
 jellyfish/concurrent_queues.hpp   |   1 -
 jellyfish/dbg.cc                  |   7 +
 jellyfish/dumper.hpp              |  25 +-
 jellyfish/err.hpp                 |  31 +-
 jellyfish/file_parser.cc          |   2 +-
 jellyfish/square_binary_matrix.cc |  11 +-
 ltmain.sh                         |  32 +-
 m4/libtool.m4                     |  61 ++--
 tests/compat.sh.in                |   2 +-
 15 files changed, 477 insertions(+), 330 deletions(-)

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