j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'develop' into coverity_scan

Browse source
This commit is contained in:
Niels 2016-05-29 13:06:40 +02:00
commit 53603500ed
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.travis.yml
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