[opengm] 334/386: Merge pull request #426 from DerThorsten/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 8e88bf0034715babbd7ada6e1a34a2835a96d240
Merge: 7a9f6e4 655291d
Author: Thorsten B <thorsten.beier at iwr.uni-heidelberg.de>
Date:   Fri Mar 25 13:15:32 2016 +0100

    Merge pull request #426 from DerThorsten/master
    
    fixed fusion for cc

 include/opengm/inference/intersection_based_inf.hxx            | 2 +-
 src/interfaces/python/opengm/inference/inference.cpp           | 2 +-
 src/interfaces/python/opengm/inference/pyIntersectionBased.cxx | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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