ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-31 18:26:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,325 Commits 15 Branches 105 Tags 179 MiB
3818351287
Commit Graph

2 Commits

Author SHA1 Message Date
Grant Limberg
3da8f5f053
freaking JNI 2020-10-21 16:08:19 -07:00
Grant Limberg
e8cdff3eaf Merge branch 'adamierymenko-dev' into android-jni-dev 
also update for changed function calls that now accept a local address

# Conflicts:
#	include/ZeroTierOne.h
#	java/CMakeLists.txt
#	java/jni/Android.mk
#	java/jni/ZT1_jnicache.cpp
#	java/jni/ZT1_jnilookup.h
#	java/jni/ZT1_jniutils.cpp
#	java/jni/com_zerotierone_sdk_Node.cpp
 2015-09-26 13:47:55 -07:00