diff options
| author | Grant Limberg <grant.limberg@zerotier.com> | 2016-10-17 14:50:18 -0700 |
|---|---|---|
| committer | Grant Limberg <grant.limberg@zerotier.com> | 2016-10-17 14:50:18 -0700 |
| commit | 0f3095f1300b44d07ccf4b8e595e7de292eb3a5b (patch) | |
| tree | 2812ef1a8cf50ee5fc8e99b2d7b8c464bd37ed0b /.gitignore | |
| parent | 772599a6fc19aa0f5cf7a1dca49985742d26aea4 (diff) | |
| parent | 7b7ec133496db4fef867d9100285a02cd3f1aed6 (diff) | |
| download | infinitytier-0f3095f1300b44d07ccf4b8e595e7de292eb3a5b.tar.gz infinitytier-0f3095f1300b44d07ccf4b8e595e7de292eb3a5b.zip | |
Merge remote-tracking branch 'macui/master' into macui-merge
# Conflicts:
# .gitignore
Diffstat (limited to '.gitignore')
| -rwxr-xr-x | .gitignore | 19 |
1 files changed, 19 insertions, 0 deletions
@@ -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/ |