void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 20:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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-test
/netconf-service/netconf.service /netconf-service/netconf.service
/ipch /ipch
/ZeroTierOne.sdf /windows/ZeroTierOne.sdf
/ZeroTierOne.v11.suo /windows/ZeroTierOne.v11.suo
/vsprojects/SelfTest/Debug /windows/SelfTest/Debug
/vsprojects/SelfTest/Release /windows/SelfTest/Release
/vsprojects/ZeroTierOne/Debug /windows/ZeroTierOne/Debug
/vsprojects/ZeroTierOne/Release /windows/ZeroTierOne/Release
/vsprojects/ZeroTierOne/x64 /windows/ZeroTierOne/x64
/vsprojects/TapDriver/Win32 /windows/TapDriver/Win32
/vsprojects/TapDriver/x64 /windows/TapDriver/x64
/vsprojects/InstallerUpdater/obj /windows/InstallerUpdater/obj
/vsprojects/Service/obj /windows/Service/obj
/vsprojects/SelfTest/SelfTest.aps /windows/SelfTest/SelfTest.aps
/Build/* /Build/*
*.log *.log
*.opensdf *.opensdf
@ -34,8 +34,3 @@
*.autosave *.autosave
/ZeroTier One.zip /ZeroTier One.zip
/ZeroTier One.dmg /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