diff options
| author | Vojin Jovanovic <vojin.jovanovic@epfl.ch> | 2012-01-09 18:11:10 +0100 |
|---|---|---|
| committer | Vojin Jovanovic <vojin.jovanovic@epfl.ch> | 2012-01-09 18:11:10 +0100 |
| commit | 1126912bce5d098571c1bd29a04e4781e19c3d85 (patch) | |
| tree | 79e753014c1adfa26e39e32911125bfc0ad8ee4c /gitignore.SAMPLE | |
| parent | 5a4b555c378d79d57b59dfd6edafd2b9a59866bb (diff) | |
| parent | 820491ed6376e9f8f8a8102387495113dce55444 (diff) | |
| download | scala-1126912bce5d098571c1bd29a04e4781e19c3d85.tar.gz scala-1126912bce5d098571c1bd29a04e4781e19c3d85.tar.bz2 scala-1126912bce5d098571c1bd29a04e4781e19c3d85.zip | |
Merge branch 'master' into execution-context
Diffstat (limited to 'gitignore.SAMPLE')
| -rw-r--r-- | gitignore.SAMPLE | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/gitignore.SAMPLE b/gitignore.SAMPLE index 3c6d8733ea..3c15a5de9e 100644 --- a/gitignore.SAMPLE +++ b/gitignore.SAMPLE @@ -2,24 +2,29 @@ /.gitignore /test/files/.gitignore -/.scala_dependencies +*.jar +*~ + +#sbt +/project/target/ +/project/project/target -# "a" and "a/" to get both file (i.e. symlink) and folder -/build -/build/ -/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/ |