Prepare for merging into main ZeroTier repo

2025-01-19 11:16:32 +00:00 · 2016-10-17 14:44:32 -07:00 · 2016-10-17 14:44:32 -07:00 · 7b7ec13349
commit 7b7ec13349
parent 7025c7090b
42 changed files with 0 additions and 0 deletions
--- a/One.xcodeproj/project.pbxproj
+++ b/One.xcodeproj/project.pbxproj
--- a/One.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/One.xcodeproj/project.xcworkspace/contents.xcworkspacedata
--- a/One/AboutViewController.h
+++ b/One/AboutViewController.h
--- a/One/AboutViewController.m
+++ b/One/AboutViewController.m
--- a/One/AboutViewController.xib
+++ b/One/AboutViewController.xib
--- a/One/AppDelegate.h
+++ b/One/AppDelegate.h
--- a/One/AppDelegate.m
+++ b/One/AppDelegate.m
--- a/One/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/One/Assets.xcassets/AppIcon.appiconset/Contents.json
--- a/One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png
+++ b/One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png
--- a/One/Assets.xcassets/Contents.json
+++ b/One/Assets.xcassets/Contents.json
--- a/One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json
+++ b/One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json
--- a/One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png
+++ b/One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png
--- a/One/Assets.xcassets/MenuBarIconMac.imageset/Menubar.png
+++ b/One/Assets.xcassets/MenuBarIconMac.imageset/Menubar.png
--- a/One/Assets.xcassets/MenuBarIconMacWhite.imageset/Contents.json
+++ b/One/Assets.xcassets/MenuBarIconMacWhite.imageset/Contents.json
--- a/One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite.png
+++ b/One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite.png
--- a/One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite@2x.png
+++ b/One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite@2x.png
--- a/One/AuthtokenCopy.h
+++ b/One/AuthtokenCopy.h
--- a/One/AuthtokenCopy.m
+++ b/One/AuthtokenCopy.m
--- a/One/Base.lproj/MainMenu.xib
+++ b/One/Base.lproj/MainMenu.xib
--- a/One/Info.plist
+++ b/One/Info.plist
--- a/One/JoinNetworkViewController.h
+++ b/One/JoinNetworkViewController.h
--- a/One/JoinNetworkViewController.m
+++ b/One/JoinNetworkViewController.m
--- a/One/JoinNetworkViewController.xib
+++ b/One/JoinNetworkViewController.xib
--- a/macui/ZeroTier
+++ b/macui/ZeroTier
--- a/macui/ZeroTier
+++ b/macui/ZeroTier
--- a/One/NetworkInfoCell.h
+++ b/One/NetworkInfoCell.h
--- a/One/NetworkInfoCell.m
+++ b/One/NetworkInfoCell.m
--- a/One/NetworkMonitor.h
+++ b/One/NetworkMonitor.h
--- a/One/NetworkMonitor.m
+++ b/One/NetworkMonitor.m
--- a/One/NodeStatus.h
+++ b/One/NodeStatus.h
--- a/One/NodeStatus.m
+++ b/One/NodeStatus.m
--- a/One/PreferencesViewController.h
+++ b/One/PreferencesViewController.h
--- a/One/PreferencesViewController.m
+++ b/One/PreferencesViewController.m
--- a/One/PreferencesViewController.xib
+++ b/One/PreferencesViewController.xib
--- a/One/ServiceCom.h
+++ b/One/ServiceCom.h
--- a/One/ServiceCom.m
+++ b/One/ServiceCom.m
--- a/One/ShowNetworksViewController.h
+++ b/One/ShowNetworksViewController.h
--- a/One/ShowNetworksViewController.m
+++ b/One/ShowNetworksViewController.m
--- a/One/ShowNetworksViewController.xib
+++ b/One/ShowNetworksViewController.xib
--- a/One/ZeroTierIcon.icns
+++ b/One/ZeroTierIcon.icns
--- a/One/about.html
+++ b/One/about.html
--- a/macui/ZeroTier
+++ b/macui/ZeroTier