fixing qrcode integration

2012-03-09 12:13:28 +01:00
parent 781f089ee1
commit 7a2e1e42d9
21 changed files with 469 additions and 467 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,23 @@
-bin/
-gen/
-.classpath
+#Android generated
+bin
+gen
+obj
+libs/armeabi
+lint.xml
+local.properties
+
+#Eclipse
 .project
-.DS_Store
+.classpath
 .settings
+
+#IntelliJ IDEA
+.idea
+*.iml
+
+#Maven
+target
+release.properties
+
+#Mac
+.DS_Store