[opengm] 39/50: Merge pull request #101 from opengm/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 b5b445edb4d9960f26b24e4ad26ff4ad023d16f6
Merge: cdbb9a2 3a6ef0d
Author: Joerg Kappes <kappes at math.uni-heidelberg.de>
Date:   Fri Oct 23 14:55:51 2015 +0200

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

 CMakeLists.txt                                     |  70 ++++++------
 include/opengm/utilities/meminfo.hxx               |   3 +-
 src/interfaces/python/CMakeLists.txt               |  33 ++----
 src/interfaces/python/examples/freelena.bmp        | Bin 0 -> 786554 bytes
 src/interfaces/python/examples/lena.bmp            | Bin 786486 -> 0 bytes
 .../python/opengm/inference/inf_def_visitor.hxx    |   4 +-
 src/unittest/inference/test_graphcut.cxx           |   8 +-
 src/unittest/test_canonicalview.cxx                |   1 +
 src/unittest/test_graphicalmodeldecomposer.cxx     | 117 +++++++++++----------
 9 files changed, 116 insertions(+), 120 deletions(-)

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