Merge 6d18e0dcef into 32eb620ef4

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "inih"]
-    path = externals/inih/inih
-    url = https://github.com/svn2github/inih
 [submodule "boost"]
     path = externals/boost
     url = https://github.com/yuzu-emu/ext-boost.git
@@ -10,15 +7,18 @@
 [submodule "dynarmic"]
     path = externals/dynarmic
     url = https://github.com/MerryMage/dynarmic.git
-[submodule "xbyak"]
-    path = externals/xbyak
-    url = https://github.com/herumi/xbyak.git
 [submodule "fmt"]
     path = externals/fmt
     url = https://github.com/fmtlib/fmt.git
+[submodule "inih"]
+    path = externals/inih/inih
+    url = https://github.com/benhoyt/inih.git
 [submodule "lz4"]
     path = externals/lz4
     url = http://github.com/lz4/lz4.git
 [submodule "unicorn"]
     path = externals/unicorn
-    url = https://github.com/yuzu-emu/unicorn
+    url = https://github.com/yuzu-emu/unicorn.git
+[submodule "xbyak"]
+    path = externals/xbyak
+    url = https://github.com/herumi/xbyak.git

.travis.yml

@@ -24,7 +24,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"

src/core/hle/service/nvdrv/nvdrv.cpp

@@ -7,8 +7,8 @@
 #include "core/hle/service/nvdrv/devices/nvdisp_disp0.h"
 #include "core/hle/service/nvdrv/devices/nvhost_as_gpu.h"
 #include "core/hle/service/nvdrv/devices/nvmap.h"
-#include "core/hle/service/nvdrv/nvdrv.h"
 #include "core/hle/service/nvdrv/interface.h"
+#include "core/hle/service/nvdrv/nvdrv.h"
 
 namespace Service {
 namespace Nvidia {