[med-svn] [htslib] 01/05: Merge branch 'develop' into bcftools+calling

[Charles Plessy]

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

plessy pushed a commit to branch debian/unstable
in repository htslib.

commit 6f5473a75137a6678ead4f27c1502df1e52b7d33
Merge: 7994a4b 06eeee1
Author: Petr Danecek <pd3 at sanger.ac.uk>
Date:   Wed Nov 20 14:45:15 2013 +0000

    Merge branch 'develop' into bcftools+calling

 Makefile          |    4 +-
 cram/cram_index.c |   85 +++++++++++++++++++++++++++++++++++++++
 cram/cram_index.h |   12 ++++++
 faidx.c           |    2 +-
 hts.c             |   14 +++----
 sam.c             |  114 +++++++++++++++++++++++++++++++++++++++++------------
 tbx.c             |    2 +-
 test/hfile.c      |   10 ++++-
 test/test_view.c  |   24 +++++++++--
 vcf.c             |    2 +-
 10 files changed, 228 insertions(+), 41 deletions(-)

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/htslib.git