github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-20 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge dev.

Browse source
This commit is contained in:
Adam Ierymenko 2015-12-04 12:45:21 -08:00
commit ac8918992b
12 changed files with 66 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/installfiles/linux/DEBIAN/control.in
View file

@ -3,6 +3,7 @@ Architecture: __ARCH__
Maintainer: ZeroTier, Inc. <contact@zerotier.com>
Priority: optional
Version: __VERSION__
Installed-Size: 1024
Homepage: https://github.com/zerotier/ZeroTierOne
Description: ZeroTier One network virtualization service
ZeroTier One is a fast, secure, and easy to use peer to peer network

19
ext/installfiles/linux/init.d/zerotier-one
View file

@ -7,21 +7,20 @@
# networks. See https://www.zerotier.com/ for more information.
### BEGIN INIT INFO
# Provides: zerotier-one
# Required-Start: $local_fs $network
# Required-Stop: $local_fs
# Default-Start: 2345
# Default-Stop: 90
# Short-Description: start ZeroTier One
# Description: ZeroTier One provides public and private distributed ethernet \
# networks. See https://www.zerotier.com/ for more information.
# Provides: zerotier-one
# Required-Start: $local_fs $network
# Required-Stop: $local_fs
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Start ZeroTier One
# Description: ZeroTier One provides public and private distributed ethernet \
# networks. See https://www.zerotier.com/ for more information.
### END INIT INFO
#
# This script is written to avoid distro-specific dependencies, so it does not
# use the rc bash script libraries found on some systems. It should work on
# just about anything, even systems using Upstart. Upstart native support may
# come in the future.
# just about anything.
#
zthome=/var/lib/zerotier-one

BIN
ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/MacOS/ZeroTier One
View file

Binary file not shown.

BIN
ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Resources/en.lproj/Window.nib generated
View file

Binary file not shown.

4
ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/_CodeSignature/CodeResources
View file

@ -39,7 +39,7 @@
<dict>
<key>hash</key>
<data>
7dgumnPDtoIzhi9QoaFhDvCo9ys=
aP0mIANPPnnTMmxYlELioz9ZO1I=
</data>
<key>optional</key>
<true/>
@ -82,7 +82,7 @@
<dict>
<key>hash</key>
<data>
7dgumnPDtoIzhi9QoaFhDvCo9ys=
aP0mIANPPnnTMmxYlELioz9ZO1I=
</data>
<key>optional</key>
<true/>

16
ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/Window.xib
View file

@ -13,22 +13,22 @@
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" animationBehavior="default" id="1">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
<rect key="contentRect" x="575" y="564" width="500" height="700"/>
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<rect key="contentRect" x="575" y="564" width="500" height="500"/>
<rect key="screenRect" x="0.0" y="0.0" width="1920" height="1178"/>
<value key="minSize" type="size" width="500" height="700"/>
<value key="maxSize" type="size" width="500" height="700"/>
<view key="contentView" id="2" customClass="ContentView">
<rect key="frame" x="0.0" y="0.0" width="500" height="700"/>
<rect key="frame" x="0.0" y="0.0" width="500" height="500"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<webView id="5">
<rect key="frame" x="0.0" y="0.0" width="500" height="700"/>
<rect key="frame" x="0.0" y="0.0" width="500" height="500"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<animations/>
<webPreferences key="preferences" defaultFontSize="12" defaultFixedFontSize="12"/>
<webPreferences key="preferences" defaultFontSize="12" defaultFixedFontSize="12">
<nil key="identifier"/>
</webPreferences>
</webView>
</subviews>
<animations/>