[opengm] 132/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 e869ad65589e40eadbd2dbc6e514258a64048437
Merge: 30448b3 e4b93b7
Author: DerThorsten <thorsten.beier at iwr.uni-heidelberg.de>
Date:   Thu Dec 18 16:26:03 2014 +0100

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

 include/opengm/learning/struct-max-margin.hxx |  6 ++---
 src/unittest/learning/test_learning.cxx       | 35 ++++++++++++++-------------
 2 files changed, 21 insertions(+), 20 deletions(-)

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