diff options
| author | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2014-01-18 10:19:53 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2014-01-18 10:19:53 -0800 |
| commit | 3d4762eab31716593492ff5d6bd986e18a5ad44a (patch) | |
| tree | 3cabe1ca034ce090a4e0e32f3099aa8c0cda4ca9 | |
| parent | a5896264fae29e952517da519502ab6103c9bbfe (diff) | |
| parent | 092e6e947e64ba3eab9b6139b1a85457e94715e3 (diff) | |
| download | infinitytier-3d4762eab31716593492ff5d6bd986e18a5ad44a.tar.gz infinitytier-3d4762eab31716593492ff5d6bd986e18a5ad44a.zip | |
Merge branch 'adamierymenko-dev' of ssh://shub-niggurath.zerotier.com/git/ZeroTierOne into adamierymenko-dev
Conflicts:
.gitignore
| -rwxr-xr-x | .gitignore | 29 |
1 files changed, 12 insertions, 17 deletions
@@ -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 |