[opengm] 336/386: Merge pull request #427 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 a89ac3000de0772c4a572ba0846905bb803721cc
Merge: 8e88bf0 20f60dc
Author: Thorsten B <thorsten.beier at iwr.uni-heidelberg.de>
Date:   Fri Mar 25 13:32:14 2016 +0100

    Merge pull request #427 from DerThorsten/master
    
    fixed include guards and WITH_*** problems for intersection based

 .travis.yml                                        | 149 +++++++++----
 .../fusion_move/permutable_label_fusion_mover.hxx  | 233 +++------------------
 2 files changed, 146 insertions(+), 236 deletions(-)

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