From: miles <miles@localhost>
Date: Tue, 17 Sep 2013 21:55:53 +0000 (+0000)
Subject: svn path=/; revision=501
X-Git-Url: http://gitweb.planteome.org/?a=commitdiff_plain;h=66b56dd549c600a601999f9dad6192b248c56220;p=old-jaiswallab-svn%2F.git

svn path=/; revision=501
---

diff --git a/Personnel/justin/lab inventory/.classpath b/Personnel/justin/lab inventory/.classpath
index 921adf7..cbecbcb 100644
--- a/Personnel/justin/lab inventory/.classpath	
+++ b/Personnel/justin/lab inventory/.classpath	
@@ -5,6 +5,6 @@
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="lib" path="/home/justin/workspace/lab inventory/libs/ZXing-2.2.zip"/>
+	<classpathentry kind="lib" path="/home/miles/lab inventory/libs/ZXing-2.2.zip"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/Personnel/justin/lab inventory/bin/lab inventory.apk b/Personnel/justin/lab inventory/bin/lab inventory.apk
index 17fdf0a..a5703bb 100644
Binary files a/Personnel/justin/lab inventory/bin/lab inventory.apk and b/Personnel/justin/lab inventory/bin/lab inventory.apk differ
diff --git a/Personnel/justin/lab inventory/src/com/jaiswallab/lab/inventory/MainActivity.java b/Personnel/justin/lab inventory/src/com/jaiswallab/lab/inventory/MainActivity.java
index 566c58e..1a76a00 100644
--- a/Personnel/justin/lab inventory/src/com/jaiswallab/lab/inventory/MainActivity.java	
+++ b/Personnel/justin/lab inventory/src/com/jaiswallab/lab/inventory/MainActivity.java	
@@ -26,7 +26,7 @@ public class MainActivity extends Activity {
     }
     
     // This method is called at click of the QR code button
-    public void qrClick(View view) {
+    public void qrClick(View view) { 
     	text.setText("QR button clicked again");
     	Intent intent = new Intent("com.google.zxing.client.android.SCAN"); 
     	startActivityForResult(intent, 0);