Merge branch 'develop' into coverity_scan

2016-05-29 13:06:40 +02:00 · 2016-05-29 13:06:40 +02:00 · 53603500ed
commit 53603500ed
parent 97ea5ae403 c0b2c6ea5d
1 changed files with 4 additions and 4 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -97,10 +97,10 @@ matrix:
      compiler: clang
      env: COMPILER=clang

-    - os: osx
-      osx_image: beta-xcode6.3
-      compiler: clang
-      env: COMPILER=clang
+  #  - os: osx
+  #    osx_image: beta-xcode6.3
+  #    compiler: clang
+  #    env: COMPILER=clang

    - os: osx
      osx_image: xcode6.4