diff options
| author | bors <bors@rust-lang.org> | 2016-05-17 04:02:15 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-05-17 04:02:15 -0700 |
| commit | 5d12502d3a54aaad5e1af48111ecc81a1c2cbf2b (patch) | |
| tree | 4b8b8cebdd5aaa96e38e8c81c3b12b4d711affc6 | |
| parent | 5743564f2d0139b8249d2ede4e720a6452d9c1d9 (diff) | |
| parent | 650855322bd1e1cf1a7175a1ccc4e29a739426a7 (diff) | |
| download | rust-5d12502d3a54aaad5e1af48111ecc81a1c2cbf2b.tar.gz rust-5d12502d3a54aaad5e1af48111ecc81a1c2cbf2b.zip | |
Auto merge of #33617 - sanmai-NL:gitignore_IntelliJ, r=nikomatsakis
IntelliJ support, ordering, cleanup
| -rw-r--r-- | .gitignore | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index acd47803969..5e8c40d03fb 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,6 @@ *.elc *.epub *.exe -*.pdb *.fn *.html *.kdev4 @@ -29,6 +28,7 @@ *.orig *.out *.patch +*.pdb *.pdf *.pg *.pot @@ -50,6 +50,10 @@ .cproject .hg/ .hgignore +.idea +__pycache__/ +*.py[cod] +*$py.class .project .settings/ .valgrindrc @@ -65,6 +69,7 @@ /llvm/ /mingw-build/ /nd/ +/obj/ /rt/ /rustllvm/ /src/libunicode/DerivedCoreProperties.txt @@ -73,13 +78,10 @@ /src/libunicode/PropList.txt /src/libunicode/Scripts.txt /src/libunicode/UnicodeData.txt -/stage0/ -/stage1/ -/stage2/ -/stage3/ +/stage[0-9]+/ +/target /test/ /tmp/ -/obj/ TAGS TAGS.emacs TAGS.vi @@ -89,11 +91,9 @@ config.mk config.stamp keywords.md lexer.ml -src/.DS_Store src/etc/dl src/librustc_llvm/llvmdeps.rs tmp.*.rs version.md version.ml version.texi -/target |