summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@typesafe.com>2016-03-23 16:36:38 +0100
committerLukas Rytz <lukas.rytz@typesafe.com>2016-03-23 16:36:38 +0100
commit1fcfdd8c8bca1adba6eff2381ac6e765141801f0 (patch)
treec94d7b1e1ab7b1fa78c53e21b834ab16788a4c5b /.gitignore
parent4ef14294453c43420e0e1a2ac984ba4a2d8b8dca (diff)
parent2b3696ec4134f08ae37414f1406a87e746bc6128 (diff)
downloadscala-2.11.x.tar.gz
scala-2.11.x.tar.bz2
scala-2.11.x.zip
Merge pull request #5054 from lrytz/intellij-2.112.11.x
Update IntelliJ build for use with sbt
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 061cd274ac..0fff976e90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@
/jenkins.properties
# target directories for ant build
+/build
/build/
/dists/
@@ -55,5 +56,6 @@
# Sbt's target directories
/target/
/project/target/
-/project/project/target
+/project/project/target/
+/project/project/project/target/
/build-sbt/