diff options
author | Lukas Rytz <lukas.rytz@epfl.ch> | 2012-01-03 15:34:58 +0100 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2012-01-03 15:36:12 +0100 |
commit | 471a63a9e6618f25feb3a5266c38ad98ea2a5ac7 (patch) | |
tree | e8a10d053952c920e3c47ca61f7aae9900f4492e | |
parent | 5618b77ca8d89b8f44db062334ac2b0663596dee (diff) | |
download | scala-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.
-rw-r--r-- | .gitignore | 5 | ||||
-rw-r--r-- | gitignore.SAMPLE | 23 | ||||
-rw-r--r-- | project.SAMPLE (renamed from .project.SAMPLE) | 0 |
3 files changed, 15 insertions, 13 deletions
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/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 index b1f7386a4a..b1f7386a4a 100644 --- a/.project.SAMPLE +++ b/project.SAMPLE |