Merge branch 'master' into v5

This commit is contained in:
loyalsoldier
2021-02-17 08:07:12 +08:00
648 changed files with 2587 additions and 2494 deletions
+5 -5
View File
@@ -1,14 +1,14 @@
package encoding
//go:generate go run v2ray.com/core/common/errors/errorgen
//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen
import (
"io"
"v2ray.com/core/common/buf"
"v2ray.com/core/common/net"
"v2ray.com/core/common/protocol"
"v2ray.com/core/proxy/vless"
"github.com/v2fly/v2ray-core/v4/common/buf"
"github.com/v2fly/v2ray-core/v4/common/net"
"github.com/v2fly/v2ray-core/v4/common/protocol"
"github.com/v2fly/v2ray-core/v4/proxy/vless"
)
const (