summaryrefslogtreecommitdiff
path: root/java/jni/ZT_jnilookup.h
AgeCommit message (Collapse)Author
2015-09-26Merge branch 'adamierymenko-dev' into android-jni-devGrant Limberg
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