[med-svn] [bamtools] 02/05: Merge tag 'upstream/2.4.0+dfsg'

[Kevin Murray]

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

daube-guest pushed a commit to branch master
in repository bamtools.

commit e21f2f256dc9450fb4d96d3d88d26fa23bf34ad3
Merge: ba80e50 00cf2a2
Author: Kevin Murray <spam at kdmurray.id.au>
Date:   Thu Sep 24 17:21:45 2015 +1000

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

 CMakeLists.txt                              |  2 +-
 docs/Doxyfile                               |  2 +-
 src/api/BamAlignment.h                      |  8 ++++----
 src/api/BamAux.h                            |  6 ++++++
 src/api/BamReader.cpp                       |  6 +++---
 src/api/BamWriter.h                         |  2 +-
 src/api/CMakeLists.txt                      |  2 +-
 src/api/SamHeader.cpp                       |  2 ++
 src/api/SamHeader.h                         |  3 +++
 src/api/SamProgram.cpp                      |  1 +
 src/api/SamProgram.h                        |  2 ++
 src/api/SamReadGroup.cpp                    |  2 ++
 src/api/SamReadGroup.h                      |  3 +++
 src/api/SamSequence.cpp                     |  2 ++
 src/api/SamSequence.h                       |  3 +++
 src/api/internal/io/HostAddress_p.cpp       |  2 +-
 src/api/internal/io/HttpHeader_p.cpp        |  3 +--
 src/api/internal/io/TcpSocketEngine_p.h     |  2 +-
 src/api/internal/sam/SamFormatParser_p.cpp  | 24 ++++++++++++++++++++++
 src/api/internal/sam/SamFormatParser_p.h    |  2 +-
 src/api/internal/sam/SamFormatPrinter_p.cpp | 31 +++++++++++++++++++++++++++++
 src/api/internal/sam/SamFormatPrinter_p.h   |  2 +-
 src/api/internal/sam/SamHeaderValidator_p.h |  6 +++---
 src/toolkit/CMakeLists.txt                  |  2 +-
 src/toolkit/bamtools.cpp                    |  2 +-
 src/toolkit/bamtools_filter.h               |  2 +-
 src/toolkit/bamtools_resolve.cpp            |  2 --
 src/toolkit/bamtools_sort.h                 |  2 +-
 src/toolkit/bamtools_split.h                |  2 +-
 src/utils/bamtools_fasta.cpp                |  2 +-
 30 files changed, 104 insertions(+), 28 deletions(-)

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