[opengm] 167/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 785ffed9d20d9270e9806c3004c79c865fcf6d5e
Merge: fa7be11 a54a107
Author: DerThorsten <thorsten.beier at iwr.uni-heidelberg.de>
Date:   Fri Dec 19 15:02:51 2014 +0100

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

 .../opengm/functions/function_properties_base.hxx  |  2 +-
 include/opengm/functions/learnable/lpotts.hxx      |  4 +-
 .../opengm/functions/learnable/lsum_of_experts.hxx |  4 +-
 include/opengm/functions/learnable/lunary.hxx      |  4 +-
 include/opengm/learning/bundle-optimizer.hxx       | 67 ++++++++++++++++++----
 include/opengm/learning/dataset/dataset_io.hxx     | 18 ++++++
 6 files changed, 81 insertions(+), 18 deletions(-)

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