Merge branch 'master' of github.com:kylebarlow/android-crickettherm

Getting files updated from laptop that weren't in last merge
kylebarlow · Mar 18, 2013 · 5634ab0 · 5634ab0
2 parents 366b639 + 36b258a
commit 5634ab0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,20 @@
+# 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
+
+# Eclipse project files
+.classpath
+.project
diff --git a/README.md b/README.md
@@ -0,0 +1,4 @@
+android-crickettherm
+====================
+
+Android application to estimate ambient temperature based on the rates of cricket chirping