diff options
| author | Martin Odersky <odersky@gmail.com> | 2012-04-13 16:27:46 -0700 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2012-04-13 16:27:46 -0700 |
| commit | 2744be417e1f2c461068bb2daef9fa8f11822031 (patch) | |
| tree | 06580aa466401d86d63176b2af429e9daaf047f9 /gitignore.SAMPLE | |
| parent | b5757577c520e6339e4278fa91f725e66561f73e (diff) | |
| parent | 1d0610840bb7409f0da084d3cc94e4110dd2e2c4 (diff) | |
| download | scala-2744be417e1f2c461068bb2daef9fa8f11822031.tar.gz scala-2744be417e1f2c461068bb2daef9fa8f11822031.tar.bz2 scala-2744be417e1f2c461068bb2daef9fa8f11822031.zip | |
Merge branch 'master' into topic/sip18
Diffstat (limited to 'gitignore.SAMPLE')
| -rw-r--r-- | gitignore.SAMPLE | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gitignore.SAMPLE b/gitignore.SAMPLE index 3c15a5de9e..483ad4caca 100644 --- a/gitignore.SAMPLE +++ b/gitignore.SAMPLE @@ -27,4 +27,9 @@ /src/intellij/*.iml /src/intellij/*.ipr /src/intellij/*.iws +/.cache +/.idea +/.settings +# bak files produced by ./cleanup-commit +*.bak |