ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-03-25 13:17:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'adamierymenko-dev' of ssh://shub-niggurath.zerotier.com/git/ZeroTierOne into adamierymenko-dev

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Adam Ierymenko 2014-01-18 10:19:53 -08:00
commit 3d4762eab3
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
.gitignore vendored
View File

@ -9,18 +9,18 @@
/netconf-service/netconf-test
/netconf-service/netconf.service
/ipch
/ZeroTierOne.sdf
/ZeroTierOne.v11.suo
/vsprojects/SelfTest/Debug
/vsprojects/SelfTest/Release
/vsprojects/ZeroTierOne/Debug
/vsprojects/ZeroTierOne/Release
/vsprojects/ZeroTierOne/x64
/vsprojects/TapDriver/Win32
/vsprojects/TapDriver/x64
/vsprojects/InstallerUpdater/obj
/vsprojects/Service/obj
/vsprojects/SelfTest/SelfTest.aps
/windows/ZeroTierOne.sdf
/windows/ZeroTierOne.v11.suo
/windows/SelfTest/Debug
/windows/SelfTest/Release
/windows/ZeroTierOne/Debug
/windows/ZeroTierOne/Release
/windows/ZeroTierOne/x64
/windows/TapDriver/Win32
/windows/TapDriver/x64
/windows/InstallerUpdater/obj
/windows/Service/obj
/windows/SelfTest/SelfTest.aps
/Build/*
*.log
*.opensdf
@ -34,8 +34,3 @@
*.autosave
/ZeroTier One.zip
/ZeroTier One.dmg
/windows/ZeroTierOne.sdf
/windows/ZeroTierOne.v11.suo
/windows/SelfTest/Release/SelfTest.lastbuildstate
/windows/SelfTest/Release/SelfTest.unsuccessfulbuild
/windows/SelfTest/Release/vc110.pdb