diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-05-07 19:16:35 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-05-07 19:16:35 -0700 |
| commit | da45840e5ad87aa86f67fbe20d0cb003d982b0f0 (patch) | |
| tree | a74f5e982b61eb443ed9c28e24fd6f1e3977d427 /.gitignore | |
| parent | 8130b2a0de08409e8c22dc388101b6b3877469dc (diff) | |
| parent | 4426899e8c9469518325f39f173151b3535ac20e (diff) | |
| download | infinitytier-da45840e5ad87aa86f67fbe20d0cb003d982b0f0.tar.gz infinitytier-da45840e5ad87aa86f67fbe20d0cb003d982b0f0.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rwxr-xr-x | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -36,6 +36,7 @@ /ZeroTier One.dmg /root-topology/bin2c /root-topology/mktopology +/root-topology/*.secret /root-topology/test/supernodes /root-topology/test/test-root-topology java/obj/ @@ -46,5 +47,5 @@ java/doc/ windows/ZeroTierOne/Debug/ java/build_win64/ java/build_win32/ - /java/mac32_64/ +/ext/mac-ui-macgap1-wrapper/MacGap.xcodeproj/project.xcworkspace/xcuserdata/* |