ZeroTierOne

mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-04-30 16:00:15 +00:00

History

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

Android.mk

Merge branch 'adamierymenko-dev' into android-jni-dev

2015-09-26 13:47:55 -07:00

Application.mk

set ZT_NO_TYPE_PUNNING and -O3 for Android builds

2015-07-08 18:00:13 -07:00

com_zerotierone_sdk_Node.cpp

Merge branch 'adamierymenko-dev' into android-jni-dev

2015-09-26 13:47:55 -07:00

com_zerotierone_sdk_Node.h

Merge branch 'adamierymenko-dev' into android-jni-dev