[opengm] 258/386: Merge branch 'master' of https://bitbucket.org/jkappes/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 480216b03c3deb4dc62c10f9b75cf9eb3e1aa794
Merge: 13c0037 9ad0b1c
Author: joergkappes <kappes at math.uni-heidelberg.de>
Date:   Fri Jan 16 11:55:16 2015 +0100

    Merge branch 'master' of https://bitbucket.org/jkappes/opengm-learning

 fubar/simple_sp.py                                  |  2 +-
 include/opengm/learning/dataset/dataset_io.hxx      |  6 +++++-
 src/interfaces/python/opengm/learning/__init__.py   | 21 +++------------------
 .../opengm/learning/pyMaxLikelihoodLearner.cxx      |  4 ++--
 4 files changed, 11 insertions(+), 22 deletions(-)

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