[med-svn] [trimmomatic] 03/06: Merge tag 'upstream/0.36+dfsg'

[Andreas Tille]

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

tille pushed a commit to branch master
in repository trimmomatic.

commit db493e28e40775f67930ca4ec58d793086ef70b1
Merge: e7c8ce9 c39d405
Author: Andreas Tille <tille at debian.org>
Date:   Thu May 19 13:42:54 2016 +0200

    Merge tag 'upstream/0.36+dfsg'
    
    Upstream version 0.36+dfsg

 build.xml                                          |  4 +-
 src/org/usadellab/trimmomatic/Trimmomatic.java     | 33 ++++++++++--
 src/org/usadellab/trimmomatic/TrimmomaticPE.java   | 11 +++-
 src/org/usadellab/trimmomatic/TrimmomaticSE.java   |  9 +++-
 .../trimmomatic/trim/HeadCropTrimmer.java          | 26 +++++++--
 .../trimmomatic/trim/TailCropTrimmer.java          | 61 ++++++++++++++++++++++
 .../usadellab/trimmomatic/trim/TrimmerFactory.java |  3 ++
 .../trimmomatic/util/ConcatGZIPInputStream.java    | 51 ++----------------
 8 files changed, 137 insertions(+), 61 deletions(-)

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