[opengm] 362/386: Merge pull request #105 from opengm/master

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/master
in repository opengm.

commit 3eca408f2d8ae78af5ab445a73d70eaa6c2b2b63
Merge: 3c0baa0 f08611e
Author: Joerg Kappes <kappes at math.uni-heidelberg.de>
Date:   Fri Apr 8 23:28:23 2016 +0200

    Merge pull request #105 from opengm/master
    
    update from master

 .travis.yml                                        | 155 +++++++++++---
 CMakeLists.txt                                     |   9 +
 README.md                                          |   2 +
 cmake/modules/FindHDF5.cmake                       | 130 +++++++-----
 cmake/modules/checkHDF5version.c                   |   8 +-
 include/opengm/graphicalmodel/graphicalmodel.hxx   |   6 +-
 .../fusion_move/permutable_label_fusion_mover.hxx  | 233 +++------------------
 .../opengm/inference/intersection_based_inf.hxx    |   2 +-
 include/opengm/utilities/meminfo.hxx               |   2 +-
 src/interfaces/python/opengm/hdf5/CMakeLists.txt   |   3 -
 .../python/opengm/inference/CMakeLists.txt         |   7 +-
 .../python/opengm/inference/inference.cpp          |  12 +-
 .../opengm/inference/param/multicut_param.hxx      |   8 +-
 .../opengm/inference/pyIntersectionBased.cxx       |   4 +-
 .../python/opengm/opengmcore/CMakeLists.txt        |   3 -
 .../python/opengm/opengmcore/function_injector.py  |   2 +-
 src/unittest/CMakeLists.txt                        |   6 +-
 src/unittest/test_partitions.cxx                   |   2 +-
 18 files changed, 274 insertions(+), 320 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opengm.git