Merge branch 'master' into development

c879148e · Oscar Fuentes · 1e3156b6 · a1a55597 · c879148e
Commit c879148e authored Oct 23, 2017 by Oscar Fuentes
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

src/android/barcode-scan.gradle
+2 -0

No files found.
--- a/src/android/barcode-scan.gradle
+++ b/src/android/barcode-scan.gradle
@@ -7,4 +7,5 @@ allprojects {
 dependencies {
    compile 'com.android.support:support-v4:18.0.0'
    compile files('libs/DeviceAPIver20160627.jar')
+    compile files('libs/DataCollection.jar')
 }
\ No newline at end of file