[opengm] 34/40: Merge pull request #412 from DerThorsten/master

[Ghislain Vaillant]

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

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

commit ddb66907a057d79f0aae2861fd222e31557997e5
Merge: 3f68450 5b790d9
Author: Thorsten B <thorsten.beier at iwr.uni-heidelberg.de>
Date:   Tue Jan 5 14:38:40 2016 +0100

    Merge pull request #412 from DerThorsten/master
    
    updated multicut related stuff

 .../fusion_move/permutable_label_fusion_mover.hxx  |   5 +-
 .../python/opengm/inference/inference.cpp          |   4 +-
 src/interfaces/python/opengm/inference/pyCgc.cxx   | 166 +++++++++++++++++++--
 src/interfaces/python/opengm/inference/pyCgc.hxx   |   5 +-
 .../opengm/inference/pyIntersectionBased.cxx       |   6 +-
 5 files changed, 162 insertions(+), 24 deletions(-)

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