[opengm] 316/386: Merge pull request #104 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 53e57074f5f0da18118a2af52b6a3e26f0d317f1
Merge: 2fa0a3c ddb6690
Author: Joerg Kappes <kappes at math.uni-heidelberg.de>
Date:   Mon Jan 18 11:03:25 2016 +0100

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

 .../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