void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-07-22 18:32:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
3031 commits 16 branches 105 tags 186 MiB
Commit graph

2 commits

Author SHA1 Message Date
Grant Limberg
be0af135bc update JNI code for 1.1.6 2016-07-07 20:07:07 -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