[opengm] 04/40: Merge pull request #102 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 7e4cdfc397c0491475ef1aa8f84967c02f2637db
Merge: b5b445e e91870b
Author: Joerg Kappes <kappes at math.uni-heidelberg.de>
Date:   Fri Nov 27 14:35:36 2015 +0100

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

 ChangeLog.txt                              | 35 +++++++++++++++++--
 Doxyfile.in                                |  2 +-
 README.md                                  | 23 +++++++++++++
 include/opengm/inference/cgc/submodel2.hxx |  7 +++-
 src/converter/CMakeLists.txt               |  6 ++--
 src/unittest/test_memoryinfo.cxx           | 22 +++++++-----
 src/unittest/test_operations.cxx           | 54 +++++++++++++++---------------
 7 files changed, 106 insertions(+), 43 deletions(-)

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