mrFq1 6c5b6847bc Merge remote-tracking branch 'origin/master' into meta-dev ... # Conflicts: # .github/workflows/main.yml # ClashX.xcodeproj/project.pbxproj # ClashX.xcworkspace/xcshareddata/swiftpm/Package.resolved # ClashX/AppDelegate.swift # ClashX/Base.lproj/Main.storyboard # ClashX/General/ApiRequest.swift # ClashX/General/Managers/AutoUpgardeManager.swift # ClashX/General/Managers/ClashResourceManager.swift # ClashX/General/Managers/ConfigManager.swift # ClashX/General/Managers/PrivilegedHelperManager.swift # ClashX/General/Utils/JSBridgeHandler.swift # ClashX/Macro/Paths.swift # ClashX/Models/ClashProxy.swift # ClashX/Support Files/en.lproj/Localizable.strings # ClashX/Support Files/zh-Hans.lproj/Localizable.strings # ClashX/ViewControllers/ClashWebViewContoller.swift # ClashX/ViewControllers/Connections/ConnectionsViewController.swift # ClashX/ViewControllers/Connections/DashboardSubViewControllerProtocol.swift # ClashX/ViewControllers/Connections/DashboardViewController.swift # ClashX/ViewControllers/Connections/Requests/ConnectionsReq.swift # ClashX/ViewControllers/Connections/Requests/StructedLogReq.swift # ClashX/ViewControllers/Connections/ViewModels/ConnectionDetailViewModel.swift # ClashX/ViewControllers/Connections/ViewModels/ConnectionLeftPannelViewModel.swift # ClashX/ViewControllers/Connections/ViewModels/ConnectionTopListViewModel.swift # ClashX/ViewControllers/Connections/ViewModels/ConnectionsViewModel.swift # ClashX/ViewControllers/Connections/Views/Cell/ConnectionCellProtocol.swift # ClashX/ViewControllers/Connections/Views/Cell/ConnectionLeftTextCellView.swift # ClashX/ViewControllers/Connections/Views/Cell/ConnectionProxyClientCellView.swift # ClashX/ViewControllers/Connections/Views/Cell/ConnectionStatusIconCellView.swift # ClashX/ViewControllers/Connections/Views/Cell/ConnectionTextCellView.swift # ClashX/ViewControllers/Connections/Views/ConnectionColume.swift # ClashX/ViewControllers/Connections/Views/ConnectionDetailInfoGeneralView.swift # ClashX/ViewControllers/Connections/Views/ConnectionDetailInfoView.swift # ClashX/ViewControllers/Connections/Views/ConnectionLeftPannelView.swift # ClashX/ViewControllers/Connections/Views/ConnectionTopListView.swift # ClashX/ViewControllers/Connections/Views/SectionedTableView.swift # ClashX/ViewControllers/Settings/DebugSettingViewController.swift # ClashX/ViewControllers/Settings/GlobalShortCutViewController.swift # ClashX/Views/StatusItem/StatusItemTool.swift # ClashX/Views/StatusItem/StatusItemView.swift # ClashX/Views/StatusItem/StatusItemView.xib # ClashX/goClash/go.mod # ClashX/goClash/go.sum # ClashX/goClash/main.go # ClashX/zh-Hans.lproj/Main.strings # Podfile # Podfile.lock		2023-09-24 19:22:08 +08:00
..
ProxyModeChangeCommand.swift	Merge remote-tracking branch 'origin/master' into meta-dev	2023-09-24 19:22:08 +08:00
ProxySetting.sdef	add support for shortcuts	2023-05-26 10:13:09 +08:00
ProxySettingCommand.swift	Merge remote-tracking branch 'origin/master' into meta-dev	2023-09-24 19:22:08 +08:00
TunModeSettingCommand.swift	feat: tun global short cut	2023-06-09 19:47:32 +08:00