[clasp] 02/02: 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 7dfeceaa39dd6c26838ca6dd1df6beb3e571c765
Merge: 460afae 6e7d325
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Wed Nov 26 08:16:44 2014 +0100

    Merge branch 'master' into devel

 CHANGES                                    |  8 +++
 libclasp/clasp/clasp_facade.h              |  2 +-
 libclasp/clasp/cli/clasp_cli_configs.inl   |  2 +-
 libclasp/clasp/cli/clasp_cli_options.inl   |  6 ++-
 libclasp/clasp/literal.h                   | 11 ++++
 libclasp/clasp/logic_program.h             |  4 +-
 libclasp/clasp/logic_program_types.h       |  5 +-
 libclasp/clasp/parser.h                    |  1 +
 libclasp/clasp/util/misc_types.h           | 11 ----
 libclasp/src/clasp_output.cpp              |  3 ++
 libclasp/src/heuristics.cpp                |  4 +-
 libclasp/src/logic_program.cpp             | 39 +++++++++++----
 libclasp/src/logic_program_types.cpp       | 10 ++--
 libclasp/src/parser.cpp                    | 11 ++++
 libclasp/tests/cli_test.cpp                | 19 +++++++
 libclasp/tests/decision_heuristic_test.cpp | 19 +++++++
 libclasp/tests/dlp_builder_test.cpp        | 80 ++++++++++++++++++++++++++++++
 libclasp/tests/program_builder_test.cpp    | 64 +++++++++++++++++++++++-
 libprogram_opts/src/string_convert.cpp     | 65 ++++++++++++------------
 19 files changed, 295 insertions(+), 69 deletions(-)

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