diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-05-21 19:14:49 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-05-21 19:14:49 -0700 |
| commit | c430d88bd40d178685ac0a2e648d8c4ea675996c (patch) | |
| tree | f69f497428fa34c6389173d39c889563dea9506c /.gitignore | |
| parent | 9a00366b18bc2bdb3ddf4345edcc7a459eb5ed60 (diff) | |
| parent | d9006712f6ffc975d97097caf2d2b4264405b32c (diff) | |
| download | infinitytier-c430d88bd40d178685ac0a2e648d8c4ea675996c.tar.gz infinitytier-c430d88bd40d178685ac0a2e648d8c4ea675996c.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rwxr-xr-x | .gitignore | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -1,12 +1,10 @@ /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 @@ -33,12 +31,16 @@ /ZeroTierOneInstaller-* .qmake.stash *.autosave -/ZeroTier One.dmg /root-topology/bin2c /root-topology/mktopology /root-topology/*.secret /root-topology/test/supernodes /root-topology/test/test-root-topology +/ext/mac-ui-macgap1-wrapper/MacGap.xcodeproj/project.xcworkspace/xcuserdata/* +/ext/mac-ui-macgap1-wrapper/MacGap.xcodeproj/project.xcworkspace/xcuserdata/* +/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/* +/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/xcuserdata/* +/ext/mac-ui-macgap1-wrapper/src/build java/obj/ java/libs/ java/bin/ @@ -48,8 +50,9 @@ windows/ZeroTierOne/Debug/ java/build_win64/ java/build_win32/ /java/mac32_64/ -/ext/mac-ui-macgap1-wrapper/MacGap.xcodeproj/project.xcworkspace/xcuserdata/* /ui/.module-cache /windows/WebUIWrapper/bin /windows/WebUIWrapper/obj node_modules +/ZeroTier One.msi +/ext/installfiles/windows/*-cache |