OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-15 05:30:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3168 from CDAGaming/pr_Improvements

Browse Source 
[External] Travis CI Quick Fix + Minor Submodule Updates
This commit is contained in:
Weiyi Wang 2018-01-18 18:27:23 +02:00 committed by GitHub
commit e2a8f155d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -40,7 +40,7 @@ matrix:
- os: osx - os: osx
env: NAME="macos build" env: NAME="macos build"
sudo: false sudo: false
osx_image: xcode7.3 osx_image: xcode9.2
install: "./.travis/macos/deps.sh" install: "./.travis/macos/deps.sh"
script: "./.travis/macos/build.sh" script: "./.travis/macos/build.sh"
after_success: "./.travis/macos/upload.sh" after_success: "./.travis/macos/upload.sh"

2
externals/enet vendored

@ -1 +1 @@
Subproject commit a84c120eff13d2fa3eadb41ef7afe0f7819f4d6c Subproject commit 39a72ab1990014eb399cee9d538fd529df99c6a0

2
externals/nihstro vendored

@ -1 +1 @@
Subproject commit 7e24743af21a7c2e3cef21ef174ae4269d0cfdac Subproject commit fd69de1a1b960ec296cc67d32257b0f9e2d89ac6