Cleaned repo from DS_Store OSX files

farquet · May 27, 2014 · 2ca35dc · 2ca35dc
1 parent b0c3142
commit 2ca35dc
Show file tree

Hide file tree

Showing 16 changed files with 44 additions and 0 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,26 @@
+logs
+project/project
+project/target
+project/boot
+project/plugins/target
+target
+.target
+tmp
+.history
+dist
+/.idea
+/*.iml
+/out
+/.idea_modules
+/RUNNING_PID
+
+# Eclipse
+.settings
+.cache
+.project
+.classpath
+.scala_dependencies
+bin
+
+#OSX
+.DS_Store
diff --git a/RxStocks/.DS_Store b/RxStocks/.DS_Store
diff --git a/RxStocks/.gitignore b/RxStocks/.gitignore
@@ -21,3 +21,6 @@ dist
 .classpath
 .scala_dependencies
 bin
+
+#OSX
+.DS_Store
diff --git a/RxStocks/app/controllers/.DS_Store b/RxStocks/app/controllers/.DS_Store
diff --git a/RxTwitterStats/.DS_Store b/RxTwitterStats/.DS_Store
diff --git a/RxTwitterStats/.gitignore b/RxTwitterStats/.gitignore
@@ -21,3 +21,6 @@ dist
 .classpath
 .scala_dependencies
 bin
+
+#OSX
+.DS_Store
diff --git a/RxTwitterStats/app/controllers/.DS_Store b/RxTwitterStats/app/controllers/.DS_Store
diff --git a/comet-clock/.gitignore b/comet-clock/.gitignore
@@ -21,3 +21,6 @@ dist
 .classpath
 .scala_dependencies
 bin
+
+#OSX
+.DS_Store
diff --git a/comet-clock/app/controllers/.DS_Store b/comet-clock/app/controllers/.DS_Store
diff --git a/iterateesDemo/.gitignore b/iterateesDemo/.gitignore
@@ -21,3 +21,6 @@ dist
 .classpath
 .scala_dependencies
 bin
+
+#OSX
+.DS_Store
diff --git a/observablesDemo/.DS_Store b/observablesDemo/.DS_Store
diff --git a/observablesDemo/.gitignore b/observablesDemo/.gitignore
@@ -21,3 +21,6 @@ dist
 .classpath
 .scala_dependencies
 bin
+
+#OSX
+.DS_Store
diff --git a/rxPlay/.DS_Store b/rxPlay/.DS_Store
diff --git a/rxPlay/.gitignore b/rxPlay/.gitignore
@@ -11,3 +11,6 @@ project/plugins/project/
 
 # Scala-IDE specific
 .scala_dependencies
+
+#OSX
+.DS_Store
diff --git a/rxPlay/src/main/scala/.DS_Store b/rxPlay/src/main/scala/.DS_Store