[opengm] 69/386: Merge branch 'master' of https://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 b8beabecf1a0975871f4fae4674880d584dc861a
Merge: df9f839 5df619d
Author: Joerg Kappes <jkappes at goedel.(none)>
Date:   Tue Dec 16 15:38:18 2014 +0100

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

 fubar/python_stuff.py                              |  75 ++++-
 include/opengm/functions/learnable/lunary.hxx      | 323 +++++++++++++++++++++
 include/opengm/functions/learnablefunction.hxx     |   4 +
 include/opengm/functions/readme.txt                |   2 +
 include/opengm/python/opengmpython.hxx             |  10 +-
 .../python/opengm/opengmcore/opengmcore.cpp        |   2 +-
 .../python/opengm/opengmcore/pyFunctionTypes.cxx   | 113 +++++++
 src/interfaces/python/opengm/opengmcore/pyGm.cxx   |  11 +-
 8 files changed, 522 insertions(+), 18 deletions(-)

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