[med-svn] [mothur] 02/04: Merge tag 'upstream/1.39.4'

[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 5ff7805a0d9b6391fbee3539f8e22189cad07992
Merge: db3ce27 e59bb6f
Author: Tomasz Buchert <tomasz at debian.org>
Date:   Tue Mar 14 23:03:19 2017 +0100

    Merge tag 'upstream/1.39.4'
    
    Upstream version 1.39.4

 Makefile                                       |   4 +-
 Mothur.xcodeproj/project.pbxproj               |  59 +++++------
 makefile-internal                              |   4 +-
 source/chimera/chimeracheckrdp.cpp             |   2 +-
 source/chimera/slayer.cpp                      |   4 +-
 source/classifier/bayesian.cpp                 |   2 +-
 source/clusterclassic.cpp                      |   2 +-
 source/commands/aligncommand.cpp               |   2 +-
 source/commands/amovacommand.cpp               |   2 +-
 source/commands/anosimcommand.cpp              |   2 +-
 source/commands/chimeraslayercommand.cpp       |   4 +-
 source/commands/classifyseqscommand.cpp        |   6 +-
 source/commands/cooccurrencecommand.cpp        |   8 +-
 source/commands/homovacommand.cpp              |   2 +-
 source/commands/lefsecommand.cpp               |   6 +-
 source/commands/makecontigscommand.cpp         |   6 +-
 source/commands/makecontigscommand.h           |   4 +
 source/commands/makefilecommand.cpp            | 130 +++++++++++++----------
 source/commands/makefilecommand.h              |   2 +-
 source/commands/mantelcommand.cpp              |   2 +-
 source/commands/nmdscommand.cpp                |   4 +-
 source/commands/phylodiversitycommand.cpp      |   2 +-
 source/commands/phylodiversitycommand.h        |   2 +-
 source/commands/sparcccommand.cpp              |   2 +-
 source/commands/sparcccommand.h                |   2 +-
 source/commands/subsamplecommand.cpp           |  28 +++--
 source/commands/summarytaxcommand.cpp          |   4 +-
 source/communitytype/communitytype.cpp         |   2 +-
 source/datastructures/blastalign.cpp           |   2 +-
 source/datastructures/blastdb.cpp              |   8 +-
 source/datastructures/oligos.cpp               |   2 +
 source/datastructures/sparsedistancematrix.cpp |   2 +-
 source/datastructures/sparsedistancematrix.h   |  15 ---
 source/datastructures/sparsematrix.cpp         |   2 +-
 source/datastructures/sparsematrix.hpp         |  12 ---
 source/datastructures/tree.cpp                 |   6 +-
 source/libshuff.cpp                            |   2 +-
 source/linearalgebra.cpp                       |   4 +-
 source/metastats/mothurmetastats.cpp           |   2 +-
 source/mothur.h                                |  33 ++++++
 source/mothurout.cpp                           | 139 ++++++++++++++++++++++++-
 source/mothurout.h                             |   8 ++
 source/opticluster.cpp                         |   4 +-
 source/randomforest/abstractdecisiontree.cpp   |   4 +-
 source/randomforest/decisiontree.cpp           |   5 +-
 source/sharedutilities.cpp                     |   2 +-
 source/subsample.cpp                           |  17 +--
 source/subsample.h                             |   8 --
 48 files changed, 369 insertions(+), 207 deletions(-)

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