[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 767d8b03d9288be21f379746afbe4011d3d49ce4
Merge: a2f40fd c73bcfa
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Sat Sep 26 08:27:39 2015 +0200

    Merge branch 'master' into devel

 CHANGES                                 |   7 ++
 debian/changelog                        |   8 ++
 libclasp/clasp/clasp_facade.h           |   2 +-
 libclasp/clasp/heuristics.h             |   2 +-
 libclasp/src/clasp_output.cpp           |  24 ++--
 libclasp/src/heuristics.cpp             |  13 +-
 libclasp/src/parallel_solve.cpp         |   5 +-
 libclasp/src/solver.cpp                 |   7 +-
 libclasp/src/weight_constraint.cpp      |  26 +++-
 libclasp/tests/facade_test.cpp          |   2 +-
 libclasp/tests/program_builder_test.cpp |  43 ++++++-
 libprogram_opts/src/string_convert.cpp  | 206 ++++++++++++++++----------------
 tools/clasp-option-config.txt           |  10 +-
 13 files changed, 213 insertions(+), 142 deletions(-)

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