Merge branch 'develop' into feature/messagepack

2016-11-28 23:24:35 +01:00 · 2016-11-28 23:24:35 +01:00 · 50f647c866
commit 50f647c866
parent ee0f23fdc6 d563c21afe
2 changed files with 7 additions and 22 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -105,33 +105,21 @@ matrix:

  # OSX / Clang

-  - os: osx
-    osx_image: beta-xcode6.1
-
-  - os: osx
-    osx_image: beta-xcode6.2
-
-  - os: osx
-    osx_image: beta-xcode6.3
-
  - os: osx
    osx_image: xcode6.4

-  - os: osx
-    osx_image: xcode7.1
-
-  - os: osx
-    osx_image: xcode7.2
-
  - os: osx
    osx_image: xcode7.3

-  #- os: osx
-  #  osx_image: xcode8
+  - os: osx
+    osx_image: xcode8

  - os: osx
    osx_image: xcode8.1

+  - os: osx
+    osx_image: xcode8.2
+
  # Linux / GCC

  - os: linux