3 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	b7df177f33	updates for origin/edge	2015-11-02 19:18:55 -08: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