Merge remote-tracking branch 'github/master'

KillerInk · Nov 15, 2018 · 9cd9308 · 9cd9308
2 parents 2776cc6 + 7214b3f
commit 9cd9308
Show file tree

Hide file tree

Showing 14 changed files with 1,513 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,4 +25,5 @@ app/libs/arm64-v8a/libfreedcam.so
 app/.externalNativeBuild/*
 .svn/*
 app/build.gradle
-app/build.gradle
+*.apk
+app/release