From 53c109cda036ac25438241566d18cc418e6c0e13 Mon Sep 17 00:00:00 2001 From: mittorn Date: Mon, 18 Jan 2016 16:36:41 +0000 Subject: [PATCH] Update submodules --- .gitmodules | 6 +++--- jni/src/HLSDK/halflife | 2 +- jni/src/Xash3D/xash3d | 2 +- jni/src/XashXT/Android.mk | 1 - jni/src/XashXT/XashXT | 1 - jni/src/hlsdk-client | 1 + 6 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 jni/src/XashXT/Android.mk delete mode 160000 jni/src/XashXT/XashXT create mode 160000 jni/src/hlsdk-client diff --git a/.gitmodules b/.gitmodules index 05b978f9..c55ce37e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,9 +10,9 @@ [submodule "jni/src/Xash3D/xash3d"] path = jni/src/Xash3D/xash3d url = https://github.com/SDLash3D/xash3d -[submodule "jni/src/XashXT/XashXT"] - path = jni/src/XashXT/XashXT - url = https://github.com/SDLash3D/hlsdk-client [submodule "xash-extras"] path = xash-extras url = https://github.com/SDLash3D/xash-extras +[submodule "jni/src/hlsdk-client"] + path = jni/src/hlsdk-client + url = https://github.com/hlsdk-client diff --git a/jni/src/HLSDK/halflife b/jni/src/HLSDK/halflife index 8d00d2c0..0e9f18de 160000 --- a/jni/src/HLSDK/halflife +++ b/jni/src/HLSDK/halflife @@ -1 +1 @@ -Subproject commit 8d00d2c01d2e60b6e3c339015f01029b1f5d48d2 +Subproject commit 0e9f18de0b93a7e0d790b4bc02a1e3402ff7deb3 diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d index 90b8efd3..b0122de8 160000 --- a/jni/src/Xash3D/xash3d +++ b/jni/src/Xash3D/xash3d @@ -1 +1 @@ -Subproject commit 90b8efd3bc2885909aa0ce3932f38d93593b540f +Subproject commit b0122de8eb02c2740636bb6b6b2d196329159b4a diff --git a/jni/src/XashXT/Android.mk b/jni/src/XashXT/Android.mk deleted file mode 100644 index 5053e7d6..00000000 --- a/jni/src/XashXT/Android.mk +++ /dev/null @@ -1 +0,0 @@ -include $(call all-subdir-makefiles) diff --git a/jni/src/XashXT/XashXT b/jni/src/XashXT/XashXT deleted file mode 160000 index d619829e..00000000 --- a/jni/src/XashXT/XashXT +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d619829efdd36a2380e5c68e19df00e92371618e diff --git a/jni/src/hlsdk-client b/jni/src/hlsdk-client new file mode 160000 index 00000000..23c63811 --- /dev/null +++ b/jni/src/hlsdk-client @@ -0,0 +1 @@ +Subproject commit 23c638111d18e68a671ccc9c7ffe893f6c8cfbd4