[opengm] 260/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 15342f8e59218b24af35ef59c98b18e096b7087f
Merge: e6bc1b0 480216b
Author: DerThorsten <thorsten.beier at iwr.uni-heidelberg.de>
Date:   Fri Jan 16 13:19:14 2015 +0100

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

 CMakeLists.txt                                         |  2 +-
 .../opengm/learning/maximum_likelihood_learning.hxx    | 18 +++++++++---------
 .../learning/test_maximum_likelihood_learner.cxx       |  6 ++----
 3 files changed, 12 insertions(+), 14 deletions(-)

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