go

SPYFF · Jun 23, 2018 · 34582f9 · 34582f9
1 parent 5866b31
commit 34582f9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,13 +1,11 @@
-[submodule "libcork"]
-	path = libcork
-	url = https://github.com/shadowsocks/libcork.git
-    ignore = dirty
 [submodule "libipset"]
 	path = libipset
 	url = https://github.com/shadowsocks/ipset.git
-    ignore = dirty
+	branch = shadowsocks
 [submodule "libbloom"]
 	path = libbloom
 	url = https://github.com/shadowsocks/libbloom.git
-    ignore = dirty
-
+[submodule "libcork"]
+	path = libcork
+	url = https://github.com/shadowsocks/libcork.git
+	branch = shadowsocks
diff --git a/libcork b/libcork
diff --git a/libipset b/libipset
+21 −0		Makefile.am
+9 −1		include/libcork/config/config.h
+4 −0		include/libcork/config/linux.h
+52 −0		include/libcork/config/mingw32.h
+34 −0		include/libcork/config/solaris.h
+25 −0		include/libcork/config/version.h
+1 −1		include/libcork/core/attributes.h
+21 −0		include/libcork/helpers/mingw.h
+1 −0		src/libcork/core/timestamp.c
+2 −1		src/libcork/posix/env.c
+1 −0		src/libcork/posix/files.c
+270 −0		src/libcork/posix/mingw.c
+9 −3		src/libcork/posix/subprocess.c