summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2014-11-03 17:03:38 +0100
committerLukas Rytz <lukas.rytz@gmail.com>2014-11-03 17:06:53 +0100
commit479ae8c9df42d5bdeb7b804f8aeb6989201467a8 (patch)
tree7ba93a9fc1deaabb6418195daea6a56454cdcd59 /.gitignore
parentd1a76d5af7faa12ebebea0923812af26c40eebc9 (diff)
downloadscala-479ae8c9df42d5bdeb7b804f8aeb6989201467a8.tar.gz
scala-479ae8c9df42d5bdeb7b804f8aeb6989201467a8.tar.bz2
scala-479ae8c9df42d5bdeb7b804f8aeb6989201467a8.zip
IntelliJ IDEA files for version 14
The latest version of the Scala plugin for IntelliJ IDEA introduces a new project structure http://blog.jetbrains.com/scala/2014/10/30/scala-plugin-update-for-intellij-idea-14-rc-is-out/ Due to a bug (https://youtrack.jetbrains.com/issue/SCL-7753), you currently need to install the latest nightly build from here: http://confluence.jetbrains.com/display/SCA/Scala+Plugin+Nightly+Builds+for+Cassiopeia The new format doesn't allow scala compiler options per-module, so the `-sourcepath src/libarary` is used for all modules.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore6
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 32a1665721..20d700dd12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,9 +39,9 @@
# eclipse, intellij
/.classpath
/.project
-/src/intellij/*.iml
-/src/intellij/*.ipr
-/src/intellij/*.iws
+/src/intellij*/*.iml
+/src/intellij*/*.ipr
+/src/intellij*/*.iws
**/.cache
/.idea
/.settings