[med-svn] [soapdenovo2] 04/08: Merge tag 'upstream/240+dfsg1'

[Andreas Tille]

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

tille pushed a commit to branch master
in repository soapdenovo2.

commit 0bba218d71a0e6a3c5b32973eec05221ae8033c1
Merge: be1137f 932cad1
Author: Andreas Tille <tille at debian.org>
Date:   Sun Dec 4 17:58:53 2016 +0100

    Merge tag 'upstream/240+dfsg1'
    
    Upstream version 240+dfsg1

 MANUAL => README.md                | 122 +++++++++++++++++++------------------
 sparsePregraph/build_preArc.cpp    |   2 +
 sparsePregraph/inc/stdinc.h        |   1 +
 sparsePregraph/multi_threads.cpp   |   2 +
 sparsePregraph/pregraph_sparse.cpp |   2 +
 standardPregraph/orderContig.c     |   4 +-
 6 files changed, 71 insertions(+), 62 deletions(-)

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