[opengm] 41/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 66f954c4d523e6a75d167b23b33c6faf6a1efc20
Merge: 62e22c7 996961b
Author: DerThorsten <thorsten.beier at iwr.uni-heidelberg.de>
Date:   Mon Dec 15 14:59:11 2014 +0100

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

 .gitignore                                       |  1 +
 include/opengm/graphicalmodel/weights.hxx        | 14 ++--
 include/opengm/learning/bundle-optimizer.hxx     | 81 +++++++++++++-----------
 include/opengm/learning/solver/BundleCollector.h | 49 ++++++++++++++
 4 files changed, 102 insertions(+), 43 deletions(-)

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