Merge branch 'wing'

Yonsm · Jul 2, 2020 · 70ef2ad · 70ef2ad
2 parents 13bb8b1 + 9841515
commit 70ef2ad
Show file tree

Hide file tree

Showing 24 changed files with 5,747 additions and 22,462 deletions.
diff --git a/trunk/user/Makefile b/trunk/user/Makefile
@@ -169,8 +169,7 @@ dir_$(CONFIG_FIRMWARE_INCLUDE_MINIEAP)			+= minieap
 dir_$(CONFIG_FIRMWARE_INCLUDE_NJIT_CLIENT)		+= njit-client
 dir_$(CONFIG_FIRMWARE_INCLUDE_MENTOHUST)		+= mentohust
 dir_$(CONFIG_FIRMWARE_INCLUDE_xTUN) 			+= xTun
-dir_$(CONFIG_FIRMWARE_INCLUDE_WING) 			+= wing	
-dir_$(CONFIG_FIRMWARE_INCLUDE_WING) 			+= dns2tcp	
+dir_$(CONFIG_FIRMWARE_INCLUDE_WING) 			+= wing
 dir_$(CONFIG_FIRMWARE_INCLUDE_WING) 			+= ipt2socks
 dir_$(CONFIG_FIRMWARE_INCLUDE_REDSOCKS)			+= redsocks
 

diff --git a/trunk/user/dns2tcp/Makefile b/trunk/user/dns2tcp/Makefile
diff --git a/trunk/user/dns2tcp/dns2tcp/LICENSE b/trunk/user/dns2tcp/dns2tcp/LICENSE
diff --git a/trunk/user/dns2tcp/dns2tcp/Makefile b/trunk/user/dns2tcp/dns2tcp/Makefile
diff --git a/trunk/user/dns2tcp/dns2tcp/README.md b/trunk/user/dns2tcp/dns2tcp/README.md