update gitignores

5 files changed, 34 insertions, 44 deletions

diff --git a/vfd-frontend/.gitignore b/vfd-frontend/.gitignore
index ed1de16..e38fe35 100644
--- a/vfd-frontend/.gitignore
+++ b/vfd-frontend/.gitignore
@@ -17,9 +17,13 @@ project/plugins/project/
 /.cache
 /.history
 
+# ensime
+.ensime
+
 # general files
 /*.jar
 *.swp
 *.class
 *.log
-*~
\ No newline at end of file
+*~
+
diff --git a/vfd-uav/.classpath b/vfd-uav/.classpath
deleted file mode 100644
index f088b7b..0000000
--- a/vfd-uav/.classpath
+++ /dev/null
@@ -1,19 +0,0 @@
-<classpath>
-  <classpathentry kind="src" path="src/main/scala" output="target/scala-2.11/classes"/>
-  <classpathentry kind="src" path="src/main/java" output="target/scala-2.11/classes"/>
-  <classpathentry kind="src" path="src/test/scala" output="target/scala-2.11/test-classes"/>
-  <classpathentry kind="src" path="src/test/java" output="target/scala-2.11/test-classes"/>
-  <classpathentry kind="src" path="-home-jakob-quadcopter-vfd-vfd-mavlink-src-main-scala" output="target/scala-2.11/classes"/>
-  <classpathentry kind="lib" path="/home/jakob/.ivy2/cache/org.scala-lang/scala-library/jars/scala-library-2.11.4.jar"/>
-  <classpathentry kind="lib" path="/home/jakob/.ivy2/cache/com.typesafe.akka/akka-actor_2.11/jars/akka-actor_2.11-2.3.6.jar"/>
-  <classpathentry kind="lib" path="/home/jakob/.ivy2/cache/com.typesafe/config/bundles/config-1.2.1.jar"/>
-  <classpathentry kind="lib" path="/home/jakob/.ivy2/cache/com.github.jodersky/flow_2.11/jars/flow_2.11-2.0.6.jar"/>
-  <classpathentry kind="lib" path="/home/jakob/.ivy2/cache/com.github.scala-incubator.io/scala-io-core_2.11/jars/scala-io-core_2.11-0.4.3.jar"/>
-  <classpathentry kind="lib" path="/home/jakob/.ivy2/cache/org.scala-lang.modules/scala-parser-combinators_2.11/bundles/scala-parser-combinators_2.11-1.0.1.jar"/>
-  <classpathentry kind="lib" path="/home/jakob/.ivy2/cache/com.madgag/scala-arm_2.11/jars/scala-arm_2.11-1.3.3.jar"/>
-  <classpathentry kind="lib" path="/home/jakob/.ivy2/cache/org.scala-lang.plugins/scala-continuations-library_2.11/bundles/scala-continuations-library_2.11-1.0.1.jar"/>
-  <classpathentry kind="lib" path="/home/jakob/.ivy2/cache/com.github.scala-incubator.io/scala-io-file_2.11/jars/scala-io-file_2.11-0.4.3.jar"/>
-  <classpathentry kind="lib" path="/home/jakob/.ivy2/cache/com.github.jodersky/flow-native/jars/flow-native-2.0.6.jar"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="output" path="bin"/>
-</classpath>
\ No newline at end of file
diff --git a/vfd-uav/.gitignore b/vfd-uav/.gitignore
new file mode 100644
index 0000000..e38fe35
--- /dev/null
+++ b/vfd-uav/.gitignore
@@ -0,0 +1,29 @@
+# sbt
+.cache
+.history/
+.lib/
+dist/*
+target/
+lib_managed/
+src_managed/
+project/boot/
+project/plugins/project/
+
+# scala-ide specific
+/.settings
+/.scala_dependencies
+/.project
+/.classpath
+/.cache
+/.history
+
+# ensime
+.ensime
+
+# general files
+/*.jar
+*.swp
+*.class
+*.log
+*~
+
diff --git a/vfd-uav/.project b/vfd-uav/.project
deleted file mode 100644
index 2a03119..0000000
--- a/vfd-uav/.project
+++ /dev/null
@@ -1,19 +0,0 @@
-<projectDescription>
-  <name>vfd-uav</name>
-  <buildSpec>
-    <buildCommand>
-      <name>org.scala-ide.sdt.core.scalabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.scala-ide.sdt.core.scalanature</nature>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-  <linkedResources>
-    <link>
-      <name>-home-jakob-quadcopter-vfd-vfd-mavlink-src-main-scala</name>
-      <type>2</type>
-      <location>/home/jakob/quadcopter/vfd/vfd-mavlink/src/main/scala</location>
-    </link>
-  </linkedResources>
-</projectDescription>
\ No newline at end of file
diff --git a/vfd-uav/.settings/org.scala-ide.sdt.core.prefs b/vfd-uav/.settings/org.scala-ide.sdt.core.prefs
deleted file mode 100644
index 4bedf82..0000000
--- a/vfd-uav/.settings/org.scala-ide.sdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by sbteclipse
-#Thu Nov 06 10:24:56 CET 2014
-scala.compiler.additionalParams=-feature
-deprecation=true
-scala.compiler.useProjectSettings=true