[opengm] 134/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 874061c8658447037d83e28fa6698a0da32ac669
Merge: 8e16060 c26a004
Author: Steffen-Wolf <Steffen.Wolf at stud.uni-heidelberg.de>
Date:   Thu Dec 18 17:06:53 2014 +0100

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

 fubar/example1.py                                 |   4 +-
 fubar/real_example.py                             | 106 ++++++++++++++++++++++
 include/opengm/learning/struct-max-margin.hxx     |   6 +-
 src/interfaces/python/opengm/learning/__init__.py |   4 +-
 src/interfaces/python/opengm/learning/helper.hxx  |  11 +++
 src/unittest/learning/test_learning.cxx           |  35 +++----
 6 files changed, 141 insertions(+), 25 deletions(-)


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