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

[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  460afae   Bump Standards-Version to 3.9.6.
      adds  f651673   Imported Upstream version 3.1.1
       new  6e7d325   Merge tag 'upstream/3.1.1'
       new  7dfecea   Merge branch 'master' into devel

The 2 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                                    |  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