[med-svn] [eagle] 02/06: Merge tag 'upstream/2.4'

[Dylan Aïssi]

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

bob.dybian-guest pushed a commit to branch master
in repository eagle.

commit 5da40b25de4af996dc464b3dd5bde1034ca33fe0
Merge: 3e898c2 2d8ac15
Author: Dylan Aïssi <bob.dybian at gmail.com>
Date:   Fri Jan 12 22:53:00 2018 +0100

    Merge tag 'upstream/2.4'
    
    Upstream version 2.4

 example/example.log          |  70 ++++++++++++-------------
 example/example_ref.log      |  15 +++---
 example/example_vcf.log      |  70 ++++++++++++-------------
 example/phased.vcf.gz        | Bin 200383 -> 200388 bytes
 example/target.phased.vcf.gz | Bin 21053 -> 21053 bytes
 src/Eagle.cpp                |  17 ++++++-
 src/Eagle.hpp                |   5 +-
 src/EagleMain.cpp            |  15 ++++--
 src/EaglePBWT.cpp            |  15 +++---
 src/EagleParams.cpp          |  11 +++-
 src/EagleParams.hpp          |   3 +-
 src/MapInterpolater.cpp      |  10 ++++
 src/SyncedVcfData.cpp        | 119 +++++++++++++++++++++++--------------------
 src/SyncedVcfData.hpp        |  19 +++----
 src/Version.hpp              |   4 +-
 15 files changed, 214 insertions(+), 159 deletions(-)

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