[med-svn] [libbpp-popgen] 04/09: Merge tag 'upstream/2.2.0'

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libbpp-popgen.

commit 8725a48cf905b66dc9413873978d881282df2e06
Merge: f910ca4 bbfffd4
Author: Andreas Tille <tille at debian.org>
Date:   Wed Apr 13 17:15:04 2016 +0200

    Merge tag 'upstream/2.2.0'
    
    Upstream version 2.2.0
    
    Conflicts:
    	debian/changelog

 CMakeLists.txt                                     |   6 +-
 ChangeLog                                          |   5 +
 Doxyfile                                           |   2 +-
 bpp-popgen.spec                                    |   4 +-
 debian/control                                     |   8 +-
 debian/copyright                                   |   8 +-
 debian/postinst                                    |  22 +-
 debian/postrm                                      |  26 +-
 debian/prerm                                       |  22 +-
 debian/rules                                       |   4 +-
 src/Bpp/PopGen/AnalyzedLoci.cpp                    |   4 +-
 src/Bpp/PopGen/AnalyzedSequences.cpp               |   2 +-
 src/Bpp/PopGen/DataSet.cpp                         |  10 +-
 src/Bpp/PopGen/GeneMapperCsvExport.cpp             |  14 +-
 src/Bpp/PopGen/GeneMapperCsvExport.h               |   5 +-
 src/Bpp/PopGen/Group.cpp                           |   4 +-
 src/Bpp/PopGen/PolymorphismMultiGContainer.cpp     |   8 +-
 .../PopGen/PolymorphismMultiGContainerTools.cpp    |   4 +-
 src/Bpp/PopGen/PolymorphismSequenceContainer.cpp   |  69 ++--
 src/Bpp/PopGen/PolymorphismSequenceContainer.h     |  31 +-
 .../PopGen/PolymorphismSequenceContainerTools.cpp  |  16 +-
 .../PopGen/PolymorphismSequenceContainerTools.h    |  13 +-
 src/Bpp/PopGen/PopgenlibIO.cpp                     |  14 +-
 src/Bpp/PopGen/SequenceStatistics.cpp              | 452 ++++++++++-----------
 src/Bpp/PopGen/SequenceStatistics.h                | 104 ++---
 25 files changed, 447 insertions(+), 410 deletions(-)

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