diff options
| author | Grant Limberg <grant.limberg@zerotier.com> | 2016-10-17 14:44:32 -0700 |
|---|---|---|
| committer | Grant Limberg <grant.limberg@zerotier.com> | 2016-10-17 14:44:32 -0700 |
| commit | 7b7ec133496db4fef867d9100285a02cd3f1aed6 (patch) | |
| tree | 84ad060465c3ac25642ffe93593f13be28123785 | |
| parent | 7025c7090b62d3404c2ea5eda0eb35fad1d2aafa (diff) | |
| download | infinitytier-7b7ec133496db4fef867d9100285a02cd3f1aed6.tar.gz infinitytier-7b7ec133496db4fef867d9100285a02cd3f1aed6.zip | |
Prepare for merging into main ZeroTier repo
| -rw-r--r-- | macui/ZeroTier One.xcodeproj/project.pbxproj (renamed from ZeroTier One.xcodeproj/project.pbxproj) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One.xcodeproj/project.xcworkspace/contents.xcworkspacedata (renamed from ZeroTier One.xcodeproj/project.xcworkspace/contents.xcworkspacedata) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/AboutViewController.h (renamed from ZeroTier One/AboutViewController.h) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/AboutViewController.m (renamed from ZeroTier One/AboutViewController.m) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/AboutViewController.xib (renamed from ZeroTier One/AboutViewController.xib) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/AppDelegate.h (renamed from ZeroTier One/AppDelegate.h) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/AppDelegate.m (renamed from ZeroTier One/AppDelegate.m) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json (renamed from ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png (renamed from ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png) | bin | 51309 -> 51309 bytes | |||
| -rw-r--r-- | macui/ZeroTier One/Assets.xcassets/Contents.json (renamed from ZeroTier One/Assets.xcassets/Contents.json) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json (renamed from ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png (renamed from ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png) | bin | 22973 -> 22973 bytes | |||
| -rw-r--r-- | macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Menubar.png (renamed from ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Menubar.png) | bin | 17234 -> 17234 bytes | |||
| -rw-r--r-- | macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/Contents.json (renamed from ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/Contents.json) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite.png (renamed from ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite.png) | bin | 17234 -> 17234 bytes | |||
| -rw-r--r-- | macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite@2x.png (renamed from ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite@2x.png) | bin | 22973 -> 22973 bytes | |||
| -rw-r--r-- | macui/ZeroTier One/AuthtokenCopy.h (renamed from ZeroTier One/AuthtokenCopy.h) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/AuthtokenCopy.m (renamed from ZeroTier One/AuthtokenCopy.m) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/Base.lproj/MainMenu.xib (renamed from ZeroTier One/Base.lproj/MainMenu.xib) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/Info.plist (renamed from ZeroTier One/Info.plist) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/JoinNetworkViewController.h (renamed from ZeroTier One/JoinNetworkViewController.h) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/JoinNetworkViewController.m (renamed from ZeroTier One/JoinNetworkViewController.m) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/JoinNetworkViewController.xib (renamed from ZeroTier One/JoinNetworkViewController.xib) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/Network.h (renamed from ZeroTier One/Network.h) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/Network.m (renamed from ZeroTier One/Network.m) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/NetworkInfoCell.h (renamed from ZeroTier One/NetworkInfoCell.h) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/NetworkInfoCell.m (renamed from ZeroTier One/NetworkInfoCell.m) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/NetworkMonitor.h (renamed from ZeroTier One/NetworkMonitor.h) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/NetworkMonitor.m (renamed from ZeroTier One/NetworkMonitor.m) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/NodeStatus.h (renamed from ZeroTier One/NodeStatus.h) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/NodeStatus.m (renamed from ZeroTier One/NodeStatus.m) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/PreferencesViewController.h (renamed from ZeroTier One/PreferencesViewController.h) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/PreferencesViewController.m (renamed from ZeroTier One/PreferencesViewController.m) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/PreferencesViewController.xib (renamed from ZeroTier One/PreferencesViewController.xib) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/ServiceCom.h (renamed from ZeroTier One/ServiceCom.h) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/ServiceCom.m (renamed from ZeroTier One/ServiceCom.m) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/ShowNetworksViewController.h (renamed from ZeroTier One/ShowNetworksViewController.h) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/ShowNetworksViewController.m (renamed from ZeroTier One/ShowNetworksViewController.m) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/ShowNetworksViewController.xib (renamed from ZeroTier One/ShowNetworksViewController.xib) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/ZeroTierIcon.icns (renamed from ZeroTier One/ZeroTierIcon.icns) | bin | 125598 -> 125598 bytes | |||
| -rw-r--r-- | macui/ZeroTier One/about.html (renamed from ZeroTier One/about.html) | 0 | ||||
| -rw-r--r-- | macui/ZeroTier One/main.m (renamed from ZeroTier One/main.m) | 0 |
42 files changed, 0 insertions, 0 deletions
diff --git a/ZeroTier One.xcodeproj/project.pbxproj b/macui/ZeroTier One.xcodeproj/project.pbxproj index 900daacb..900daacb 100644 --- a/ZeroTier One.xcodeproj/project.pbxproj +++ b/macui/ZeroTier One.xcodeproj/project.pbxproj diff --git a/ZeroTier One.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/macui/ZeroTier One.xcodeproj/project.xcworkspace/contents.xcworkspacedata index fd60338e..fd60338e 100644 --- a/ZeroTier One.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/macui/ZeroTier One.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/ZeroTier One/AboutViewController.h b/macui/ZeroTier One/AboutViewController.h index d3d5bc14..d3d5bc14 100644 --- a/ZeroTier One/AboutViewController.h +++ b/macui/ZeroTier One/AboutViewController.h diff --git a/ZeroTier One/AboutViewController.m b/macui/ZeroTier One/AboutViewController.m index 21dceae1..21dceae1 100644 --- a/ZeroTier One/AboutViewController.m +++ b/macui/ZeroTier One/AboutViewController.m diff --git a/ZeroTier One/AboutViewController.xib b/macui/ZeroTier One/AboutViewController.xib index a0df0fcf..a0df0fcf 100644 --- a/ZeroTier One/AboutViewController.xib +++ b/macui/ZeroTier One/AboutViewController.xib diff --git a/ZeroTier One/AppDelegate.h b/macui/ZeroTier One/AppDelegate.h index a00cfba9..a00cfba9 100644 --- a/ZeroTier One/AppDelegate.h +++ b/macui/ZeroTier One/AppDelegate.h diff --git a/ZeroTier One/AppDelegate.m b/macui/ZeroTier One/AppDelegate.m index 5da6b354..5da6b354 100644 --- a/ZeroTier One/AppDelegate.m +++ b/macui/ZeroTier One/AppDelegate.m diff --git a/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json b/macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json index 24c81d35..24c81d35 100644 --- a/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png b/macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png Binary files differindex d225c2e3..d225c2e3 100644 --- a/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png +++ b/macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png diff --git a/ZeroTier One/Assets.xcassets/Contents.json b/macui/ZeroTier One/Assets.xcassets/Contents.json index da4a164c..da4a164c 100644 --- a/ZeroTier One/Assets.xcassets/Contents.json +++ b/macui/ZeroTier One/Assets.xcassets/Contents.json diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json b/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json index a680b58b..a680b58b 100644 --- a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json +++ b/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png b/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png Binary files differindex 9fd3d3de..9fd3d3de 100644 --- a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png +++ b/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Menubar.png b/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Menubar.png Binary files differindex ee0d7e3f..ee0d7e3f 100644 --- a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Menubar.png +++ b/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Menubar.png diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/Contents.json b/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/Contents.json index 61737760..61737760 100644 --- a/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/Contents.json +++ b/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/Contents.json diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite.png b/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite.png Binary files differindex 7049ae55..7049ae55 100644 --- a/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite.png +++ b/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite.png diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite@2x.png b/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite@2x.png Binary files differindex 8c20e36f..8c20e36f 100644 --- a/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite@2x.png +++ b/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite@2x.png diff --git a/ZeroTier One/AuthtokenCopy.h b/macui/ZeroTier One/AuthtokenCopy.h index f0497cc6..f0497cc6 100644 --- a/ZeroTier One/AuthtokenCopy.h +++ b/macui/ZeroTier One/AuthtokenCopy.h diff --git a/ZeroTier One/AuthtokenCopy.m b/macui/ZeroTier One/AuthtokenCopy.m index a10350f7..a10350f7 100644 --- a/ZeroTier One/AuthtokenCopy.m +++ b/macui/ZeroTier One/AuthtokenCopy.m diff --git a/ZeroTier One/Base.lproj/MainMenu.xib b/macui/ZeroTier One/Base.lproj/MainMenu.xib index 6b6da2a6..6b6da2a6 100644 --- a/ZeroTier One/Base.lproj/MainMenu.xib +++ b/macui/ZeroTier One/Base.lproj/MainMenu.xib diff --git a/ZeroTier One/Info.plist b/macui/ZeroTier One/Info.plist index e04b5f28..e04b5f28 100644 --- a/ZeroTier One/Info.plist +++ b/macui/ZeroTier One/Info.plist diff --git a/ZeroTier One/JoinNetworkViewController.h b/macui/ZeroTier One/JoinNetworkViewController.h index 428959fb..428959fb 100644 --- a/ZeroTier One/JoinNetworkViewController.h +++ b/macui/ZeroTier One/JoinNetworkViewController.h diff --git a/ZeroTier One/JoinNetworkViewController.m b/macui/ZeroTier One/JoinNetworkViewController.m index cae26541..cae26541 100644 --- a/ZeroTier One/JoinNetworkViewController.m +++ b/macui/ZeroTier One/JoinNetworkViewController.m diff --git a/ZeroTier One/JoinNetworkViewController.xib b/macui/ZeroTier One/JoinNetworkViewController.xib index 2ef43442..2ef43442 100644 --- a/ZeroTier One/JoinNetworkViewController.xib +++ b/macui/ZeroTier One/JoinNetworkViewController.xib diff --git a/ZeroTier One/Network.h b/macui/ZeroTier One/Network.h index 0f3c4964..0f3c4964 100644 --- a/ZeroTier One/Network.h +++ b/macui/ZeroTier One/Network.h diff --git a/ZeroTier One/Network.m b/macui/ZeroTier One/Network.m index 16efc6e3..16efc6e3 100644 --- a/ZeroTier One/Network.m +++ b/macui/ZeroTier One/Network.m diff --git a/ZeroTier One/NetworkInfoCell.h b/macui/ZeroTier One/NetworkInfoCell.h index be9345d7..be9345d7 100644 --- a/ZeroTier One/NetworkInfoCell.h +++ b/macui/ZeroTier One/NetworkInfoCell.h diff --git a/ZeroTier One/NetworkInfoCell.m b/macui/ZeroTier One/NetworkInfoCell.m index dc75cab3..dc75cab3 100644 --- a/ZeroTier One/NetworkInfoCell.m +++ b/macui/ZeroTier One/NetworkInfoCell.m diff --git a/ZeroTier One/NetworkMonitor.h b/macui/ZeroTier One/NetworkMonitor.h index 8cdec4ed..8cdec4ed 100644 --- a/ZeroTier One/NetworkMonitor.h +++ b/macui/ZeroTier One/NetworkMonitor.h diff --git a/ZeroTier One/NetworkMonitor.m b/macui/ZeroTier One/NetworkMonitor.m index 7ed22c4a..7ed22c4a 100644 --- a/ZeroTier One/NetworkMonitor.m +++ b/macui/ZeroTier One/NetworkMonitor.m diff --git a/ZeroTier One/NodeStatus.h b/macui/ZeroTier One/NodeStatus.h index eab5bfe4..eab5bfe4 100644 --- a/ZeroTier One/NodeStatus.h +++ b/macui/ZeroTier One/NodeStatus.h diff --git a/ZeroTier One/NodeStatus.m b/macui/ZeroTier One/NodeStatus.m index 3bae3c7d..3bae3c7d 100644 --- a/ZeroTier One/NodeStatus.m +++ b/macui/ZeroTier One/NodeStatus.m diff --git a/ZeroTier One/PreferencesViewController.h b/macui/ZeroTier One/PreferencesViewController.h index 56d0fdb8..56d0fdb8 100644 --- a/ZeroTier One/PreferencesViewController.h +++ b/macui/ZeroTier One/PreferencesViewController.h diff --git a/ZeroTier One/PreferencesViewController.m b/macui/ZeroTier One/PreferencesViewController.m index 13927fba..13927fba 100644 --- a/ZeroTier One/PreferencesViewController.m +++ b/macui/ZeroTier One/PreferencesViewController.m diff --git a/ZeroTier One/PreferencesViewController.xib b/macui/ZeroTier One/PreferencesViewController.xib index 62aef4c0..62aef4c0 100644 --- a/ZeroTier One/PreferencesViewController.xib +++ b/macui/ZeroTier One/PreferencesViewController.xib diff --git a/ZeroTier One/ServiceCom.h b/macui/ZeroTier One/ServiceCom.h index 74ab2b35..74ab2b35 100644 --- a/ZeroTier One/ServiceCom.h +++ b/macui/ZeroTier One/ServiceCom.h diff --git a/ZeroTier One/ServiceCom.m b/macui/ZeroTier One/ServiceCom.m index 4982d40e..4982d40e 100644 --- a/ZeroTier One/ServiceCom.m +++ b/macui/ZeroTier One/ServiceCom.m diff --git a/ZeroTier One/ShowNetworksViewController.h b/macui/ZeroTier One/ShowNetworksViewController.h index 5c251674..5c251674 100644 --- a/ZeroTier One/ShowNetworksViewController.h +++ b/macui/ZeroTier One/ShowNetworksViewController.h diff --git a/ZeroTier One/ShowNetworksViewController.m b/macui/ZeroTier One/ShowNetworksViewController.m index e3a1e52c..e3a1e52c 100644 --- a/ZeroTier One/ShowNetworksViewController.m +++ b/macui/ZeroTier One/ShowNetworksViewController.m diff --git a/ZeroTier One/ShowNetworksViewController.xib b/macui/ZeroTier One/ShowNetworksViewController.xib index f26cb446..f26cb446 100644 --- a/ZeroTier One/ShowNetworksViewController.xib +++ b/macui/ZeroTier One/ShowNetworksViewController.xib diff --git a/ZeroTier One/ZeroTierIcon.icns b/macui/ZeroTier One/ZeroTierIcon.icns Binary files differindex 17e60d58..17e60d58 100644 --- a/ZeroTier One/ZeroTierIcon.icns +++ b/macui/ZeroTier One/ZeroTierIcon.icns diff --git a/ZeroTier One/about.html b/macui/ZeroTier One/about.html index 4fa41d7b..4fa41d7b 100644 --- a/ZeroTier One/about.html +++ b/macui/ZeroTier One/about.html diff --git a/ZeroTier One/main.m b/macui/ZeroTier One/main.m index 108a6bd1..108a6bd1 100644 --- a/ZeroTier One/main.m +++ b/macui/ZeroTier One/main.m |
