[clasp] 01/05: Merge tag 'upstream/3.1.3'

[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 c73bcfad382600f1c2367875f67c7ae5ba035ea9
Merge: 61f30c5 030c4ca
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Sat Sep 26 08:26:45 2015 +0200

    Merge tag 'upstream/3.1.3'
    
    Upstream version 3.1.3

 CHANGES                                 |   7 ++
 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 +-
 12 files changed, 205 insertions(+), 142 deletions(-)

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