[gringo] 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 gringo.

commit a985c41200bdd0c8549ac57c82cc0b02dd2c6998
Merge: e83ed81 34a7a12
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Sat Sep 26 09:29:40 2015 +0200

    Merge branch 'master' into devel

 CHANGES                                    |   7 +
 README                                     |   5 +-
 SConscript                                 |  23 +++-
 SConstruct                                 |  19 ++-
 app/clingo/src/clingo_app.cc               |   2 +-
 app/clingo/tests/lua/project_bug.lp        |  13 ++
 app/clingo/tests/lua/project_bug.sol       |   3 +
 app/gringo/main.cc                         |   2 +-
 app/web/main.cc                            |  70 ++++++++++
 debian/changelog                           |   7 +
 examples/clingo/robots/README              |   4 +-
 examples/clingo/robots/visualize.py        |   2 +
 libclasp/clasp/clasp_facade.h              |   2 +-
 libclasp/clasp/heuristics.h                |   2 +-
 libclasp/clasp/util/hash_map.h             |  41 ++++++
 libclasp/src/clasp_output.cpp              |  19 +--
 libclasp/src/heuristics.cpp                |  13 +-
 libclasp/src/parallel_solve.cpp            |   5 +-
 libclasp/src/solver.cpp                    |   7 +-
 libclasp/src/weight_constraint.cpp         |  26 +++-
 libclingo/src/clingocontrol.cc             |  28 ++--
 libgringo/gringo/base.hh                   |   2 +-
 libgringo/gringo/flyweight.hh              |   3 +
 libgringo/gringo/ground/binders.hh         |  10 +-
 libgringo/gringo/ground/literals.hh        |   3 +-
 libgringo/gringo/input/literals.hh         |   1 +
 libgringo/gringo/intervals.hh              |   5 +-
 libgringo/gringo/locatable.hh              |   2 +-
 libgringo/gringo/logger.hh                 |   3 +
 libgringo/gringo/utility.hh                |   8 +-
 libgringo/gringo/value.hh                  |   2 +-
 libgringo/gringo/version.hh                |   2 +-
 libgringo/src/ground/instantiation.cc      |   2 +-
 libgringo/src/ground/literals.cc           |  20 +--
 libgringo/src/ground/statements.cc         |  28 ++--
 libgringo/src/input/aggregates.cc          |  70 +++++-----
 libgringo/src/input/groundtermparser.cc    |   2 +-
 libgringo/src/input/literals.cc            |  16 ++-
 libgringo/src/input/nongroundparser.cc     |   6 +-
 libgringo/src/input/program.cc             |   6 +-
 libgringo/src/input/programbuilder.cc      |   6 +-
 libgringo/src/input/statement.cc           |  12 +-
 libgringo/src/lua.cc                       |   2 +-
 libgringo/src/output/literals.cc           |  43 +++---
 libgringo/src/output/output.cc             |  38 +++---
 libgringo/src/output/statements.cc         |  14 +-
 libgringo/src/python.cc                    |  30 ++---
 libgringo/src/term.cc                      |  22 +--
 libgringo/tests/ground/instantiation.cc    |   2 +-
 libgringo/tests/ground/program.cc          |   2 +-
 libgringo/tests/input/program.cc           |   6 +-
 libgringo/tests/lua.cc                     |  37 +++++-
 libgringo/tests/output/incremental.cc      |   2 +-
 libgringo/tests/output/lparse.cc           |  11 ++
 libgringo/tests/output/solver_helper.hh    |   4 +-
 libgringo/tests/term.cc                    |   4 +-
 libgringo/tests/term_helper.hh             |   2 +-
 libgringo/tests/tests.hh                   |   4 +-
 libgringo/tests/utility.cc                 |  24 ++--
 libprogram_opts/program_opts/application.h |   2 +-
 libprogram_opts/src/string_convert.cpp     | 206 +++++++++++++++--------------
 libreify/reify/util.hh                     |   2 +-
 libreify/src/parser.cc                     |   1 +
 libreify/tests/parser.cc                   |   2 +-
 64 files changed, 604 insertions(+), 365 deletions(-)

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