[opengm] 115/386: Merge branch 'master' of github.com:joergkappes/opengm-learning

[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 3fb35cd8eb291e1ed1d656a5001807626215b286
Merge: 267ca72 45d07c3
Author: DerThorsten <thorsten.beier at iwr.uni-heidelberg.de>
Date:   Thu Dec 18 13:26:16 2014 +0100

    Merge branch 'master' of github.com:joergkappes/opengm-learning

 .../opengm/datastructures/marray/marray_hdf5.hxx   |  6 +--
 include/opengm/learning/dataset/dataset_io.hxx     |  2 +
 include/opengm/learning/struct-max-margin.hxx      | 35 +++++++---------
 src/unittest/CMakeLists.txt                        | 16 --------
 src/unittest/learning/CMakeLists.txt               | 18 +++++++-
 src/unittest/learning/test_learning.cxx            | 48 +++++++++++++++++-----
 6 files changed, 74 insertions(+), 51 deletions(-)

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