[med-svn] [mothur] 03/05: Merge tag 'upstream/1.37.5'

[Tomasz Buchert]

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

tomasz pushed a commit to branch master
in repository mothur.

commit 8118804fe4697eb94c0b577b2c7f5b1091138097
Merge: 159be53 5ce5d72
Author: Tomasz Buchert <tomasz at debian.org>
Date:   Sun Jun 12 19:57:25 2016 +0200

    Merge tag 'upstream/1.37.5'
    
    Upstream version 1.37.5

 makefile-internal                        |  4 +-
 source/commands/chimerauchimecommand.cpp |  2 +-
 source/commands/clustersplitcommand.cpp  | 27 ++++++-----
 source/commands/makecontigscommand.cpp   | 80 +++++++++++++++++---------------
 source/commands/makecontigscommand.h     |  1 +
 source/mothurout.cpp                     |  4 +-
 source/mothurout.h                       |  2 +-
 source/vsearchfileparser.cpp             |  2 +-
 8 files changed, 65 insertions(+), 57 deletions(-)

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