[med-svn] [htslib] 05/06: 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 32187cce7288411282d0e6ea1cb16cb5a98616e3
Merge: fa1a13a 5e770b3
Author: Charles Plessy <plessy at riken.jp>
Date:   Tue Dec 10 18:26:40 2013 +0900

    Merge branch 'develop' into debian/unstable

 Makefile                   |   2 +-
 faidx.c                    |   2 +
 htslib/khash_str2int.h     |  98 +++++++++++++++++++
 htslib/synced_bcf_reader.h |  28 +++---
 htslib/vcf.h               |  18 ++--
 synced_bcf_reader.c        | 232 ++++++++++++++++++++++-----------------------
 test/test-vcf-api.c        |  14 ++-
 vcf.c                      |  19 ++--
 8 files changed, 256 insertions(+), 157 deletions(-)

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