diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-02-02 11:13:23 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-02-02 11:13:23 +1000 |
| commit | 70f960cfd1d43ee1b873c22a471c8350a966b2a7 (patch) | |
| tree | 99be5b41a9b55236ef2abb9e6978a90eb12184a8 /.gitignore | |
| parent | 8b5f2b435b4b14089806406c8923f7e845d10ef6 (diff) | |
| parent | 41766537c03e5ed953cc806c2a8629b115097996 (diff) | |
| download | scala-70f960cfd1d43ee1b873c22a471c8350a966b2a7.tar.gz scala-70f960cfd1d43ee1b873c22a471c8350a966b2a7.tar.bz2 scala-70f960cfd1d43ee1b873c22a471c8350a966b2a7.zip | |
Merge pull request #4272 from retronym/merge/2.11.x-to-2.12.x-20150129
Merge 2.11.x to 2.12.x
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
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 |