[clasp] 01/04: Merge tag 'upstream/3.1.4'

[Thomas Krennwallner]

This is an automated email from the git hooks/post-receive script.

tkren-guest pushed a commit to branch devel
in repository clasp.

commit f0e40ea64304d2d9088ff912387f33c2ccfae3ef
Merge: c4c261c d4602d6
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Sat Dec 19 13:50:18 2015 +0100

    Merge tag 'upstream/3.1.4'
    
    Upstream version 3.1.4

 CHANGES                                 | 10 +++++++++
 libclasp/clasp/clasp_facade.h           |  2 +-
 libclasp/src/asp_preprocessor.cpp       |  7 +++++--
 libclasp/src/clasp_facade.cpp           |  8 +++++++-
 libclasp/src/clause.cpp                 | 18 ++++++++---------
 libclasp/src/heuristics.cpp             | 16 ++++++++++++---
 libclasp/src/logic_program.cpp          | 36 ++++++++++++++++++++++++---------
 libclasp/src/model_enumerators.cpp      |  2 +-
 libclasp/src/solver_strategies.cpp      |  5 ++++-
 libclasp/tests/cli_test.cpp             | 10 ++++++++-
 libclasp/tests/program_builder_test.cpp | 19 +++++++++++++++++
 11 files changed, 104 insertions(+), 29 deletions(-)

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