[med-svn] [htslib] 09/10: Merge branch 'develop' into debian/unstable

[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 ac4c98ad382fad693029cc85095b1dcb1db95a91
Merge: 15eac2b 56d50b2
Author: Charles Plessy <plessy at debian.org>
Date:   Sun Oct 5 09:34:38 2014 +0900

    Merge branch 'develop' into debian/unstable

 .gitignore             |   1 +
 Makefile               |  12 +-
 bgzf.c                 |  45 +++----
 faidx.c                |  10 +-
 htslib.mk              |   1 +
 htslib/bgzf.h          |   7 +-
 htslib/khash_str2int.h |   9 ++
 htslib/regidx.h        | 140 +++++++++++++++++++++
 htslib_vars.mk         |   1 +
 regidx.c               | 322 +++++++++++++++++++++++++++++++++++++++++++++++++
 synced_bcf_reader.c    |   6 +-
 test/test-regidx.c     | 116 ++++++++++++++++++
 12 files changed, 638 insertions(+), 32 deletions(-)

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