forked from xuhaoyang/ClashForAndroid
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
2ac1ade
commit f029973
Showing
1 changed file
with
1 addition
and
1 deletion.
There are no files selected for viewing
Submodule clash
updated
17 files
+2 −2 | adapter/outbound/direct.go | |
+4 −4 | adapter/outbound/hysteria.go | |
+5 −5 | adapter/outbound/util.go | |
+2 −2 | adapter/outbound/wireguard.go | |
+7 −15 | component/dialer/dialer.go | |
+0 −29 | component/dialer/resolver.go | |
+0 −12 | component/resolver/defaults.go | |
+0 −19 | component/resolver/host_windows.go | |
+10 −74 | component/resolver/resolver.go | |
+28 −19 | config/config.go | |
+3 −0 | dns/patch_android.go | |
+40 −7 | dns/resolver.go | |
+16 −1 | dns/system.go | |
+8 −3 | docs/config.yaml | |
+17 −6 | hub/executor/executor.go | |
+8 −0 | main.go | |
+2 −4 | tunnel/statistic/manager.go |