[opengm] 319/386: Merge pull request #419 from consti123/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 e3408d084b219dce69a515117c3c1253e3cb5b7d
Merge: f0c167b 5368bf5
Author: Thorsten B <thorsten.beier at iwr.uni-heidelberg.de>
Date:   Mon Feb 22 16:52:13 2016 +0100

    Merge pull request #419 from consti123/master
    
    Intersection Based and 3-cycles

 src/interfaces/python/opengm/inference/CMakeLists.txt        |  4 ++--
 src/interfaces/python/opengm/inference/inference.cpp         | 12 +++++-------
 .../python/opengm/inference/param/multicut_param.hxx         |  8 ++++++--
 .../python/opengm/inference/pyIntersectionBased.cxx          |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

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