lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into software-fixes

This commit is contained in:
Alam Ed Arias 2016-06-01 11:44:50 -04:00
parent 87cf02e21b d86dc67218
commit 4e41525bef
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -172,7 +172,7 @@ matrix:
# - os: osx
# osx_image: beta-xcode6.3
# #I think xcode.6.3 VM is broken, it does not boot
# - os: osx
- os: osx
osx_image: xcode6.4
#Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)
- os: osx