[opengm] 292/386: Merge branch 'learning-experimental' of https://github.com/ilastikdev/opengm-1 into structured_learning_2

[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 adf58c8a2ad27a2461f9729d26ca32472a884baf
Merge: b6a5d0d 7c1b6f0
Author: Janez Ales <janez.ales at iwr.uni-heidelberg.de>
Date:   Fri Nov 6 12:01:18 2015 +0100

    Merge branch 'learning-experimental' of https://github.com/ilastikdev/opengm-1 into structured_learning_2
    
    Conflicts:
    	include/opengm/inference/lpcplex2.hxx

 README.md                                               |  4 +++-
 include/opengm/functions/learnable/lunary.hxx           |  4 ++--
 include/opengm/inference/lpcplex2.hxx                   |  1 +
 include/opengm/inference/lpgurobi2.hxx                  | 10 ++++++++++
 include/opengm/learning/solver/QuadraticSolverFactory.h |  4 ++--
 5 files changed, 18 insertions(+), 5 deletions(-)

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