[med-svn] samtools 15/26: Merge branch 'calling' into develop

[Charles Plessy]

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

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

commit 58a95a692a8e58ab5854bc7cb3017660bee433c0
Merge: 4a18e5f af54972
Author: Petr Danecek <pd3 at sanger.ac.uk>
Date:   Thu Nov 28 14:44:22 2013 +0000

    Merge branch 'calling' into develop

 Makefile               |   3 +-
 bam2bcf.c              |  48 +--
 bam2bcf.h              |   2 +-
 bam2depth.c            |  15 +-
 bam_flags.c            |  43 +++
 bam_plcmd.c            |  85 +++--
 bamtk.c                |   5 +-
 bedcov.c               |  13 +-
 cut_target.c           |  27 +-
 phase.c                |  23 +-
 samtools.h             |   9 +
 test/dat/mpileup.out.2 | 976 ++++++++++++++++++++++++-------------------------
 test/dat/mpileup.out.3 |  11 +
 test/test.pl           |   2 +
 14 files changed, 683 insertions(+), 579 deletions(-)

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