summaryrefslogtreecommitdiff
path: root/gitignore.SAMPLE
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@epfl.ch>2012-01-03 15:34:58 +0100
committerLukas Rytz <lukas.rytz@epfl.ch>2012-01-03 15:36:12 +0100
commit471a63a9e6618f25feb3a5266c38ad98ea2a5ac7 (patch)
treee8a10d053952c920e3c47ca61f7aae9900f4492e /gitignore.SAMPLE
parent5618b77ca8d89b8f44db062334ac2b0663596dee (diff)
downloadscala-471a63a9e6618f25feb3a5266c38ad98ea2a5ac7.tar.gz
scala-471a63a9e6618f25feb3a5266c38ad98ea2a5ac7.tar.bz2
scala-471a63a9e6618f25feb3a5266c38ad98ea2a5ac7.zip
updated gitignore.SAMPLE, moved removed . from .project.SAMPLE to be in line with the other files.
Diffstat (limited to 'gitignore.SAMPLE')
-rw-r--r--gitignore.SAMPLE23
1 files changed, 15 insertions, 8 deletions
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/