Merge branch 'develop' into coverity_scan

This commit is contained in:
Niels 2016-05-29 12:57:30 +02:00
commit 97ea5ae403

View file

@ -39,7 +39,7 @@ matrix:
name: "nlohmann/json" name: "nlohmann/json"
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" build_command_prepend: "make clean ; sudo cp $(which g++-5) $(which g++)"
build_command: "make doctest" build_command: "make doctest"
branch_pattern: coverity_scan branch_pattern: coverity_scan
env: COMPILER=g++-5 env: COMPILER=g++-5