Merge pull request #3168 from CDAGaming/pr_Improvements

[External] Travis CI Quick Fix + Minor Submodule Updates
2018-01-18 18:27:23 +02:00 · 2018-01-18 18:27:23 +02:00 · e2a8f155d3
parent e1ffcde355 51169de364
commit e2a8f155d3
3 changed files with 3 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -40,7 +40,7 @@ matrix:
    - os: osx
      env: NAME="macos build"
      sudo: false
-      osx_image: xcode7.3
+      osx_image: xcode9.2
      install: "./.travis/macos/deps.sh"
      script: "./.travis/macos/build.sh"
      after_success: "./.travis/macos/upload.sh"
--- a/externals/enet
+++ b/externals/enet
@ -1 +1 @@
-Subproject commit a84c120eff13d2fa3eadb41ef7afe0f7819f4d6c
+Subproject commit 39a72ab1990014eb399cee9d538fd529df99c6a0
--- a/externals/nihstro
+++ b/externals/nihstro
@ -1 +1 @@
-Subproject commit 7e24743af21a7c2e3cef21ef174ae4269d0cfdac
+Subproject commit fd69de1a1b960ec296cc67d32257b0f9e2d89ac6
		`@ -1 +1 @@`
			`Subproject commit a84c120eff13d2fa3eadb41ef7afe0f7819f4d6c`				`Subproject commit 39a72ab1990014eb399cee9d538fd529df99c6a0`
		`@ -1 +1 @@`
			`Subproject commit 7e24743af21a7c2e3cef21ef174ae4269d0cfdac`				`Subproject commit fd69de1a1b960ec296cc67d32257b0f9e2d89ac6`