[opengm] 243/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 52b2d4c4073be8de487835bb88429628501fd276
Merge: 10aa887 e9e0209
Author: DerThorsten <thorsten.beier at iwr.uni-heidelberg.de>
Date:   Thu Jan 15 11:37:46 2015 +0100

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

 fubar/real_example_2.py                            |   6 +-
 include/opengm/functions/view_convert_function.hxx |  36 +++++--
 .../learning/maximum_likelihood_learning.hxx       |   6 +-
 .../python/opengm/learning/pyWeights.cxx           |   1 +
 src/interfaces/python/test.py                      | 115 ++++++++++++++++++++-
 5 files changed, 152 insertions(+), 12 deletions(-)

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