Merge branch 'adamierymenko-dev' into android-jni

Conflicts: .gitignore
2015-05-07 19:16:35 -07:00
parent 8130b2a0de 4426899e8c
commit da45840e5a
65 changed files with 6990 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -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/*