Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev

2025-06-23 01:18:58 +00:00 · 2021-08-13 15:12:23 -04:00
parent 126669b718 6fd45c1f9d
commit 6492f4487b
51 changed files with 0 additions and 0 deletions
--- a/windows/WinUI/APIHandler.cs
+++ b/windows/WinUI/APIHandler.cs
--- a/windows/WinUI/AboutView.xaml
+++ b/windows/WinUI/AboutView.xaml
--- a/windows/WinUI/AboutView.xaml.cs
+++ b/windows/WinUI/AboutView.xaml.cs
--- a/windows/WinUI/App.config
+++ b/windows/WinUI/App.config
--- a/windows/WinUI/App.xaml
+++ b/windows/WinUI/App.xaml
--- a/windows/WinUI/App.xaml.cs
+++ b/windows/WinUI/App.xaml.cs
--- a/windows/WinUI/CentralAPI.cs
+++ b/windows/WinUI/CentralAPI.cs
--- a/windows/WinUI/CentralLogin.cs
+++ b/windows/WinUI/CentralLogin.cs
--- a/windows/WinUI/CentralNetwork.cs
+++ b/windows/WinUI/CentralNetwork.cs
--- a/windows/WinUI/CentralServer.cs
+++ b/windows/WinUI/CentralServer.cs
--- a/windows/WinUI/CentralToken.cs
+++ b/windows/WinUI/CentralToken.cs
--- a/windows/WinUI/CentralUser.cs
+++ b/windows/WinUI/CentralUser.cs
--- a/windows/WinUI/Fonts/segoeui.ttf
+++ b/windows/WinUI/Fonts/segoeui.ttf
--- a/windows/WinUI/Fonts/segoeuib.ttf
+++ b/windows/WinUI/Fonts/segoeuib.ttf
--- a/windows/WinUI/Fonts/segoeuii.ttf
+++ b/windows/WinUI/Fonts/segoeuii.ttf
--- a/windows/WinUI/Fonts/segoeuiz.ttf
+++ b/windows/WinUI/Fonts/segoeuiz.ttf
--- a/windows/WinUI/ISwitchable.cs
+++ b/windows/WinUI/ISwitchable.cs
--- a/windows/WinUI/JoinNetworkView.xaml
+++ b/windows/WinUI/JoinNetworkView.xaml
--- a/windows/WinUI/JoinNetworkView.xaml.cs
+++ b/windows/WinUI/JoinNetworkView.xaml.cs
--- a/windows/WinUI/MainWindow.xaml.cs
+++ b/windows/WinUI/MainWindow.xaml.cs
--- a/windows/WinUI/NetworkInfoView.xaml
+++ b/windows/WinUI/NetworkInfoView.xaml
--- a/windows/WinUI/NetworkInfoView.xaml.cs
+++ b/windows/WinUI/NetworkInfoView.xaml.cs
--- a/windows/WinUI/NetworkListView.xaml
+++ b/windows/WinUI/NetworkListView.xaml
--- a/windows/WinUI/NetworkListView.xaml.cs
+++ b/windows/WinUI/NetworkListView.xaml.cs
--- a/windows/WinUI/NetworkMonitor.cs
+++ b/windows/WinUI/NetworkMonitor.cs
--- a/windows/WinUI/NetworkNameGenerator.cs
+++ b/windows/WinUI/NetworkNameGenerator.cs
--- a/windows/WinUI/NetworkRoute.cs
+++ b/windows/WinUI/NetworkRoute.cs
--- a/windows/WinUI/NetworksPage.xaml
+++ b/windows/WinUI/NetworksPage.xaml
--- a/windows/WinUI/NetworksPage.xaml.cs
+++ b/windows/WinUI/NetworksPage.xaml.cs
--- a/windows/WinUI/PeersPage.xaml
+++ b/windows/WinUI/PeersPage.xaml
--- a/windows/WinUI/PeersPage.xaml.cs
+++ b/windows/WinUI/PeersPage.xaml.cs
--- a/windows/WinUI/PreferencesView.xaml
+++ b/windows/WinUI/PreferencesView.xaml
--- a/windows/WinUI/PreferencesView.xaml.cs
+++ b/windows/WinUI/PreferencesView.xaml.cs
--- a/windows/WinUI/Properties/AssemblyInfo.cs
+++ b/windows/WinUI/Properties/AssemblyInfo.cs
--- a/windows/WinUI/Properties/Resources.Designer.cs
+++ b/windows/WinUI/Properties/Resources.Designer.cs
--- a/windows/WinUI/Properties/Resources.resx
+++ b/windows/WinUI/Properties/Resources.resx
--- a/windows/WinUI/Properties/Settings.Designer.cs
+++ b/windows/WinUI/Properties/Settings.Designer.cs
--- a/windows/WinUI/Properties/Settings.settings
+++ b/windows/WinUI/Properties/Settings.settings
--- a/windows/WinUI/Resources/ZeroTierIcon.ico
+++ b/windows/WinUI/Resources/ZeroTierIcon.ico
--- a/windows/WinUI/Simple
+++ b/windows/WinUI/Simple
--- a/windows/WinUI/Themes/Generic.xaml
+++ b/windows/WinUI/Themes/Generic.xaml
--- a/windows/WinUI/ToolbarItem.xaml
+++ b/windows/WinUI/ToolbarItem.xaml
--- a/windows/WinUI/ToolbarItem.xaml.cs
+++ b/windows/WinUI/ToolbarItem.xaml.cs
--- a/windows/WinUI/WinUI.csproj
+++ b/windows/WinUI/WinUI.csproj
--- a/windows/WinUI/ZeroTierIcon.ico
+++ b/windows/WinUI/ZeroTierIcon.ico
--- a/windows/WinUI/ZeroTierNetwork.cs
+++ b/windows/WinUI/ZeroTierNetwork.cs
--- a/windows/WinUI/ZeroTierPeer.cs
+++ b/windows/WinUI/ZeroTierPeer.cs
--- a/windows/WinUI/ZeroTierPeerPhysicalPath.cs
+++ b/windows/WinUI/ZeroTierPeerPhysicalPath.cs
--- a/windows/WinUI/ZeroTierStatus.cs
+++ b/windows/WinUI/ZeroTierStatus.cs
--- a/windows/WinUI/app.manifest
+++ b/windows/WinUI/app.manifest
--- a/windows/WinUI/packages.config
+++ b/windows/WinUI/packages.config