From 8e709180304327fd07c741f9817bbc74adca584e Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Thu, 8 Dec 2011 16:52:53 -0800
Subject: Deleted the sbt 0.7 project.

Pretty sure nobody's using this? Let's make some space
for our upcoming friend the 0.11 project.
---
 gitignore.SAMPLE | 2 --
 1 file changed, 2 deletions(-)

(limited to 'gitignore.SAMPLE')

diff --git a/gitignore.SAMPLE b/gitignore.SAMPLE
index 3c6d8733ea..ac50f91b2f 100644
--- a/gitignore.SAMPLE
+++ b/gitignore.SAMPLE
@@ -2,8 +2,6 @@
 /.gitignore
 /test/files/.gitignore
 
-/.scala_dependencies
-
 # "a" and "a/" to get both file (i.e. symlink) and folder
 /build
 /build/
-- 
cgit v1.2.3


From 471a63a9e6618f25feb3a5266c38ad98ea2a5ac7 Mon Sep 17 00:00:00 2001
From: Lukas Rytz <lukas.rytz@epfl.ch>
Date: Tue, 3 Jan 2012 15:34:58 +0100
Subject: updated gitignore.SAMPLE, moved removed . from .project.SAMPLE to be
 in line with the other files.

---
 .gitignore       |  5 -----
 .project.SAMPLE  | 29 -----------------------------
 gitignore.SAMPLE | 23 +++++++++++++++--------
 project.SAMPLE   | 29 +++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 42 deletions(-)
 delete mode 100644 .gitignore
 delete mode 100644 .project.SAMPLE
 create mode 100644 project.SAMPLE

(limited to 'gitignore.SAMPLE')

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 8b8b6978b8..0000000000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*.jar
-*.obj
-*.log
-*~
-target/
diff --git a/.project.SAMPLE b/.project.SAMPLE
deleted file mode 100644
index b1f7386a4a..0000000000
--- a/.project.SAMPLE
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>scala</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.scala-ide.sdt.core.scalabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.scala-ide.sdt.core.scalanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/gitignore.SAMPLE b/gitignore.SAMPLE
index ac50f91b2f..3c15a5de9e 100644
--- a/gitignore.SAMPLE
+++ b/gitignore.SAMPLE
@@ -2,22 +2,29 @@
 /.gitignore
 /test/files/.gitignore
 
-# "a" and "a/" to get both file (i.e. symlink) and folder
-/build
-/build/
-/target
+*.jar
+*~
+
+#sbt
+/project/target/
+/project/project/target
+
 /target/
+/src/jline/target/
+
+# target directories for ant build
+/build/
 /dists/
+
+# other
 /out/
 /bin/
-
 /sandbox/
 
+# eclipse, intellij
 /.classpath
-
+/.project
 /src/intellij/*.iml
 /src/intellij/*.ipr
 /src/intellij/*.iws
 
-/project/boot/
-/project/build/target/
diff --git a/project.SAMPLE b/project.SAMPLE
new file mode 100644
index 0000000000..b1f7386a4a
--- /dev/null
+++ b/project.SAMPLE
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>scala</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.scala-ide.sdt.core.scalabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.scala-ide.sdt.core.scalanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
-- 
cgit v1.2.3