Skip to content
Snippets Groups Projects
Commit 4e41525b authored by Alam Ed Arias's avatar Alam Ed Arias
Browse files

Merge branch 'master' into software-fixes

parents 87cf02e2 d86dc672
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
.travis.yml
+ 1
− 1
View file @ 4e41525b
...@@ -172,7 +172,7 @@ matrix: ...@@ -172,7 +172,7 @@ matrix:
# - os: osx # - os: osx
# osx_image: beta-xcode6.3 # osx_image: beta-xcode6.3
# #I think xcode.6.3 VM is broken, it does not boot # #I think xcode.6.3 VM is broken, it does not boot
# - os: osx - os: osx
osx_image: xcode6.4 osx_image: xcode6.4
#Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn) #Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)
- os: osx - os: osx
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment