4 Commits

Author	SHA1	Message	Date
Grant Limberg	0564bb3b35	added missing copyright/license info from ZT_jniutils	2016-09-21 14:09:46 -07:00
Grant Limberg	d063f583ee	Added VirtualNetworkRoute class and added it to VirtualNetworkConfig	2016-09-05 13:52:29 -07:00
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