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

Merge remote-tracking branch 'macui/master' into macui-merge

Browse source 
# Conflicts:
#	.gitignore
This commit is contained in:
Grant Limberg 2016-10-17 14:50:18 -07:00
commit 0f3095f130
43 changed files with 4317 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

19
.gitignore vendored
View file

@ -1,3 +1,4 @@
<<<<<<< HEAD
# Main binaries created in *nix builds
/zerotier-one
/zerotier-idtool
@ -83,3 +84,21 @@ windows/WinUI/obj/
windows/WinUI/bin/
windows/ZeroTierOne/Debug/
/ext/installfiles/windows/chocolatey/zerotier-one/*.nupkg
# Miscellaneous mac/Xcode droppings
.DS_Store
.Trashes
*.swp
*~.nib
DerivedData/
build/
*.pbxuser
*.mode1v3
*.mode2v3
*.perspectivev3
!default.pbxuser
!default.mode1v3
!default.mode2v3
!default.perspectivev3
*.xccheckout
xcuserdata/