[clasp] 02/05: Merge branch 'master' into devel

[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 e9b0c21c4b8c061945a4538fed75d7c9d254927d
Merge: f0bce6a 303568e
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Sun Sep 4 09:19:40 2016 +0200

    Merge branch 'master' into devel

 CHANGES                                    | 10 +++++++
 CMakeLists.txt                             | 17 +++++++++++-
 build_vc/vc12/clasp/clasp.sln              |  5 +++-
 build_vc/vc12/clasp/test/test.vcxproj      |  6 ++++-
 libclasp/clasp/clasp_facade.h              |  5 ++--
 libclasp/clasp/cli/clasp_options.h         |  8 +++---
 libclasp/src/clasp_facade.cpp              | 12 +++++----
 libclasp/src/clasp_options.cpp             |  7 ++---
 libclasp/src/dependency_graph.cpp          |  7 +++++
 libclasp/src/logic_program_types.cpp       |  6 +++--
 libclasp/src/model_enumerators.cpp         |  2 +-
 libclasp/src/parallel_solve.cpp            |  3 +++
 libclasp/src/satelite.cpp                  |  4 ++-
 libclasp/src/shared_context.cpp            |  6 +++--
 libclasp/src/solver.cpp                    |  3 ++-
 libclasp/tests/cli_test.cpp                | 42 ++++++++++++++++++------------
 libclasp/tests/decision_heuristic_test.cpp |  6 ++---
 libclasp/tests/dlp_builder_test.cpp        |  5 +++-
 libclasp/tests/enumerator_test.cpp         | 33 ++++++++++++++++++++++-
 libclasp/tests/facade_test.cpp             | 40 +++++++++++++++++++++++++---
 libclasp/tests/program_builder_test.cpp    |  4 +--
 libclasp/tests/solver_test.cpp             |  2 ++
 libclasp/tests/unfounded_check_test.cpp    |  3 ++-
 23 files changed, 182 insertions(+), 54 deletions(-)

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