Merge branch 'develop'
Showing
- .gitignore 0 additions, 3 deletions.gitignore
- .gitmodules 4 additions, 0 deletions.gitmodules
- CHANGELOG 31 additions, 0 deletionsCHANGELOG
- app/assets/urls/bitmask demo.url 2 additions, 1 deletionapp/assets/urls/bitmask demo.url
- app/assets/urls/calyx.url 3 additions, 1 deletionapp/assets/urls/calyx.url
- app/assets/urls/riseup.url 2 additions, 1 deletionapp/assets/urls/riseup.url
- app/build.gradle 55 additions, 46 deletionsapp/build.gradle
- app/jni 1 addition, 0 deletionsapp/jni
- app/jni/Android.mk 0 additions, 77 deletionsapp/jni/Android.mk
- app/jni/Application.mk 0 additions, 11 deletionsapp/jni/Application.mk
- app/jni/dummy.cpp 0 additions, 8 deletionsapp/jni/dummy.cpp
- app/jni/jbcrypto.cpp 0 additions, 95 deletionsapp/jni/jbcrypto.cpp
- app/jni/jniglue.c 0 additions, 24 deletionsapp/jni/jniglue.c
- app/jni/jniglue.h 0 additions, 21 deletionsapp/jni/jniglue.h
- app/jni/minivpn.c 0 additions, 0 deletionsapp/jni/minivpn.c
- app/jni/scan_ifs.c 0 additions, 109 deletionsapp/jni/scan_ifs.c
- app/lzo 1 addition, 0 deletionsapp/lzo
- app/lzo/AUTHORS 0 additions, 3 deletionsapp/lzo/AUTHORS
- app/lzo/Android.mk 0 additions, 97 deletionsapp/lzo/Android.mk
- app/lzo/B/00README.TXT 0 additions, 51 deletionsapp/lzo/B/00README.TXT
Loading
Please register or sign in to comment