Merge branch 'develop' into coverity_scan

This commit is contained in:
Niels 2016-05-29 13:32:48 +02:00
commit 03db7b0dbb

View File

@ -40,7 +40,7 @@ matrix:
description: "Build submitted via Travis CI" description: "Build submitted via Travis CI"
notification_email: niels.lohmann@gmail.com notification_email: niels.lohmann@gmail.com
build_command_prepend: "make clean ; sudo cp $(which g++-5) $(which g++)" build_command_prepend: "make clean ; sudo cp $(which g++-5) $(which g++)"
build_command: "make doctest" build_command: "make doctest || true"
branch_pattern: coverity_scan branch_pattern: coverity_scan
env: COMPILER=g++-5 env: COMPILER=g++-5