Merge branch 'upgrade-step1' into upgrade-step2

This commit is contained in:
Eric Fiselier 2015-03-09 14:34:44 -04:00
commit 6590ceab74

View File

@ -13,6 +13,9 @@ matrix:
- os: osx
env: BUILD_TYPE=Release STD=c++11
env:
- CTEST_OUTPUT_ON_FAILURE=1
language:
- cpp