Merge branch 'develop' into coverity_scan

This commit is contained in:
Niels committed 2016-05-29 13:06:40 +02:00
commit 53603500ed
1 file changed
+4 -4
+4 -4
View File
@@ -97,10 +97,10 @@ matrix:
compiler: clang compiler: clang
env: COMPILER=clang env: COMPILER=clang
- os: osx # - os: osx
osx_image: beta-xcode6.3 # osx_image: beta-xcode6.3
compiler: clang # compiler: clang
env: COMPILER=clang # env: COMPILER=clang
- os: osx - os: osx
osx_image: xcode6.4 osx_image: xcode6.4