|
|
@@ -1,59 +0,0 @@
|
|
|
-/ext/llvm-g++-Xcode4.6.2
|
|
|
-/ext/llvm-g++-Xcode4.6.2.tar.bz2
|
|
|
-/zerotier-*
|
|
|
-/ZeroTierUI/*.user
|
|
|
-*.o
|
|
|
-.DS_Store
|
|
|
-.Apple*
|
|
|
-*.dSYM
|
|
|
-/netconf-service/node_modules
|
|
|
-/ipch
|
|
|
-/windows/ZeroTierOne.sdf
|
|
|
-/windows/ZeroTierOne.v11.suo
|
|
|
-/windows/x64
|
|
|
-/windows/Win32
|
|
|
-/windows/*/x64
|
|
|
-/windows/*/Win32
|
|
|
-/windows/ZeroTierOne/Release
|
|
|
-/windows/ZeroTierOneService/obj
|
|
|
-/windows/ZeroTierOneService/bin
|
|
|
-/windows/Build
|
|
|
-/ext/installfiles/windows/ZeroTier One-SetupFiles
|
|
|
-/ext/installfiles/windows/Prerequisites
|
|
|
-*.log
|
|
|
-*.opensdf
|
|
|
-*.user
|
|
|
-*.cache
|
|
|
-*.obj
|
|
|
-*.tlog
|
|
|
-*.pid
|
|
|
-/*.deb
|
|
|
-/*.rpm
|
|
|
-/build-*
|
|
|
-/ZeroTierOneInstaller-*
|
|
|
-.qmake.stash
|
|
|
-*.autosave
|
|
|
-/ZeroTier One.dmg
|
|
|
-/root-topology/bin2c
|
|
|
-/root-topology/mktopology
|
|
|
-/root-topology/*.secret
|
|
|
-<<<<<<< HEAD
|
|
|
-/testnet/local-testnet/n????
|
|
|
-/testnet/local-testnet/*/peers.persist
|
|
|
-/testnet/local-testnet/*/authtoken.secret
|
|
|
-/testnet/local-testnet/*/*.log
|
|
|
-/testnet/local-testnet/*/*.old
|
|
|
-/testnet/local-testnet/*/root-topology
|
|
|
-/testnet/local-testnet/*/local.conf
|
|
|
-/testnet/local-testnet/*/networks.d
|
|
|
-/netconf/netconf.db
|
|
|
-java/obj/
|
|
|
-java/libs/
|
|
|
-java/bin/
|
|
|
-java/classes/
|
|
|
-java/doc/
|
|
|
-windows/ZeroTierOne/Debug/
|
|
|
-=======
|
|
|
-/root-topology/test/supernodes
|
|
|
-/root-topology/test/test-root-topology
|
|
|
->>>>>>> adamierymenko-dev
|
Adam Ierymenko