[clasp] branch devel updated (7dfecea -> a2f40fd)

[Thomas Krennwallner]

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

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

      from  7dfecea   Merge branch 'master' into devel
      adds  26d2824   Update changelog
      adds  9b4437a   Merge branch 'devel'
      adds  3931b37   Update changelog
      adds  66508c2   Imported Upstream version 3.1.2
       new  58cbf50   Merge tag 'upstream/3.1.2'
       new  5fe40e6   Merge branch 'master' into devel
       new  a2f40fd   Fix dep5-copyright-license-name-not-unique and missing-license-paragraph-in-dep5-copyright lintian warnings.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGES                                       |  10 +
 build_vc/vc12/clasp/examples/examples.vcxproj |   1 +
 debian/changelog                              |   7 +
 debian/copyright                              |  27 ++-
 libclasp/clasp/asp_preprocessor.h             |   1 +
 libclasp/clasp/clasp_facade.h                 |  54 ++++--
 libclasp/clasp/cli/clasp_cli_options.inl      |   1 +
 libclasp/clasp/heuristics.h                   |   2 +
 libclasp/clasp/logic_program.h                |  19 +-
 libclasp/clasp/logic_program_types.h          |   8 +-
 libclasp/clasp/solve_algorithms.h             |   3 +-
 libclasp/clasp/solver.h                       |   2 +
 libclasp/clasp/solver_strategies.h            |   2 +-
 libclasp/src/asp_preprocessor.cpp             |  22 ++-
 libclasp/src/cb_enumerator.cpp                |   5 +-
 libclasp/src/clasp_facade.cpp                 | 239 ++++++++++++++----------
 libclasp/src/enumerator.cpp                   |   5 +-
 libclasp/src/heuristics.cpp                   |  29 +--
 libclasp/src/logic_program.cpp                |  52 ++++--
 libclasp/src/logic_program_types.cpp          |  13 +-
 libclasp/src/minimize_constraint.cpp          |   5 +-
 libclasp/src/parallel_solve.cpp               |   2 +-
 libclasp/src/shared_context.cpp               |   3 -
 libclasp/src/solve_algorithms.cpp             |  13 +-
 libclasp/src/solver.cpp                       |  66 ++++++-
 libclasp/tests/decision_heuristic_test.cpp    |  67 +++++++
 libclasp/tests/dlp_builder_test.cpp           |  57 ++++++
 libclasp/tests/enumerator_test.cpp            |  16 ++
 libclasp/tests/facade_test.cpp                | 252 ++++++++++++++++++++++++--
 libclasp/tests/program_builder_test.cpp       |  58 ++++++
 libclasp/tests/rule_test.cpp                  |   6 +-
 libclasp/tests/solver_test.cpp                |  24 +++
 32 files changed, 865 insertions(+), 206 deletions(-)

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