diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-05-21 19:14:49 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-05-21 19:14:49 -0700 |
| commit | c430d88bd40d178685ac0a2e648d8c4ea675996c (patch) | |
| tree | f69f497428fa34c6389173d39c889563dea9506c /ext/bin | |
| parent | 9a00366b18bc2bdb3ddf4345edcc7a459eb5ed60 (diff) | |
| parent | d9006712f6ffc975d97097caf2d2b4264405b32c (diff) | |
| download | infinitytier-c430d88bd40d178685ac0a2e648d8c4ea675996c.tar.gz infinitytier-c430d88bd40d178685ac0a2e648d8c4ea675996c.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Conflicts:
.gitignore
Diffstat (limited to 'ext/bin')
| -rw-r--r-- | ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi | bin | 0 -> 1454080 bytes |
| -rw-r--r-- | ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi | bin | 0 -> 1070592 bytes |
| -rw-r--r-- | ext/bin/win-ui-wrapper/ZeroTier One.exe | bin | 0 -> 763352 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi b/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi Binary files differnew file mode 100644 index 00000000..7e6fc426 --- /dev/null +++ b/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi diff --git a/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi b/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi Binary files differnew file mode 100644 index 00000000..80b330a8 --- /dev/null +++ b/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi diff --git a/ext/bin/win-ui-wrapper/ZeroTier One.exe b/ext/bin/win-ui-wrapper/ZeroTier One.exe Binary files differnew file mode 100644 index 00000000..622b5b36 --- /dev/null +++ b/ext/bin/win-ui-wrapper/ZeroTier One.exe |