[med-svn] [scrm] 02/03: Merge tag 'upstream/1.7.1'

[Kevin Murray]

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

daube-guest pushed a commit to branch master
in repository scrm.

commit f02770a4024f7d0bc29b48d41bb52743b4c9cd61
Merge: fe04004 cc13731
Author: Kevin Murray <spam at kdmurray.id.au>
Date:   Thu Mar 24 11:12:08 2016 +1100

    Merge tag 'upstream/1.7.1'
    
    Upstream version 1.7.1

 NEWS.md                                  |  14 +++
 configure.ac                             |   2 +-
 src/forest-debug.cc                      |  10 +--
 src/forest.cc                            |  19 ++--
 src/forest.h                             |   4 +-
 src/model.cc                             |  61 +++++++------
 src/model.h                              |  13 +--
 src/summary_statistics/newick_tree.h     |  19 ++--
 src/summary_statistics/oriented_forest.h |   3 +
 src/summary_statistics/seg_sites.cc      |   2 +-
 tests/test_binaries.sh                   |   1 +
 tests/unittests/test_forest.cc           |  19 +++-
 tests/unittests/test_model.cc            |  44 +++++-----
 tests/unittests/test_param.cc            | 146 +++++++++++++++----------------
 14 files changed, 194 insertions(+), 163 deletions(-)

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