[med-svn] [bamtools] 02/08: Merge tag 'upstream/2.3.0+dfsg' into debian

[Andreas Tille]

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

tille pushed a commit to branch debian
in repository bamtools.

commit 1624450fcd61b0d762e97fee88d8a649a8aa116c
Merge: f314c74 bfd618f
Author: Andreas Tille <tille at debian.org>
Date:   Wed Apr 2 13:11:37 2014 +0200

    Merge tag 'upstream/2.3.0+dfsg' into debian
    
    Upstream version 2.3.0+dfsg

 CMakeLists.txt                            |   4 +-
 docs/Doxyfile                             |   2 +-
 src/api/CMakeLists.txt                    |  14 +-
 src/api/SamHeader.cpp                     |   1 +
 src/api/internal/bam/BamMultiReader_p.cpp |   4 +-
 src/api/internal/index/CMakeLists.txt     |   4 +-
 src/api/internal/io/BamHttp_p.cpp         | 394 ++++++++++++++++++++----------
 src/api/internal/io/BamHttp_p.h           |   8 +-
 src/api/internal/io/CMakeLists.txt        |  22 +-
 src/api/internal/io/HttpHeader_p.h        |   2 +-
 src/api/internal/io/RollingBuffer_p.cpp   |   6 +-
 src/api/internal/io/TcpSocket_p.cpp       |   6 +-
 src/api/internal/io/TcpSocket_p.h         |   6 +-
 src/api/internal/sam/CMakeLists.txt       |   4 +-
 src/api/internal/utils/CMakeLists.txt     |   4 +-
 src/toolkit/CMakeLists.txt                |   2 +-
 src/toolkit/bamtools_convert.cpp          |   2 +-
 src/toolkit/bamtools_coverage.cpp         |   3 +-
 src/toolkit/bamtools_filter.cpp           |  28 ++-
 src/toolkit/bamtools_random.cpp           |  24 +-
 src/toolkit/bamtools_resolve.cpp          |  20 +-
 src/toolkit/bamtools_split.cpp            |  23 +-
 src/utils/CMakeLists.txt                  |   4 +-
 src/utils/bamtools_filter_engine.h        |   5 +-
 24 files changed, 396 insertions(+), 196 deletions(-)

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