history-museum/Clash.Meta
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'clash/dev' into Alpha

Browse Source 
# Conflicts:
#	.github/workflows/docker.yml
#	adapter/outboundgroup/fallback.go
#	adapter/outboundgroup/loadbalance.go
#	adapter/outboundgroup/relay.go
#	adapter/outboundgroup/selector.go
#	adapter/outboundgroup/urltest.go
#	config/config.go
#	go.mod
#	go.sum
#	main.go
#	test/go.mod
#	test/go.sum
This commit is contained in:
MetaCubeX
2022-03-17 01:41:51 +08:00
parent c791044ddf fb7d340233
commit 609d69191a
70 changed files with 241 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
component/dialer/bind_others.go
View File

@ -1,5 +1,4 @@
//go:build !linux && !darwin
// +build !linux,!darwin
package dialer

1
component/dialer/mark_linux.go
View File

@ -1,5 +1,4 @@
//go:build linux
// +build linux
package dialer

1
component/dialer/mark_nonlinux.go
View File

@ -1,5 +1,4 @@
//go:build !linux
// +build !linux
package dialer

1
component/dialer/reuse_others.go
View File

@ -1,5 +1,4 @@
//go:build !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !windows
// +build !darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!windows
package dialer

1
component/dialer/reuse_unix.go
View File

@ -1,5 +1,4 @@
//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
// +build darwin dragonfly freebsd linux netbsd openbsd solaris
package dialer