Merge branch 'origin/master'

thermatk · Feb 21, 2014 · 2bb1260 · 2bb1260
2 parents 19de7fc + 73e4c9e
commit 2bb1260
Show file tree

Hide file tree

Showing 3 changed files with 697 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,19 @@
+# built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/