Merge branch 'master' of github.com:Saljack/NUR-Zavody

Saljack · Nov 5, 2012 · 8f302fd · 8f302fd
2 parents 5d90b3f + 998e48f
commit 8f302fd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,16 @@
+# 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
diff --git a/README.md b/README.md
@@ -0,0 +1,4 @@
+NUR-Zavody
+==========
+
+NUR závody