Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IntelliJ support, ordering, cleanup #33617

Merged
merged 1 commit into from
May 17, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
*.elc
*.epub
*.exe
*.pdb
*.fn
*.html
*.kdev4
Expand All @@ -29,6 +28,7 @@
*.orig
*.out
*.patch
*.pdb
*.pdf
*.pg
*.pot
Expand All @@ -50,6 +50,10 @@
.cproject
.hg/
.hgignore
.idea
__pycache__/
*.py[cod]
*$py.class
.project
.settings/
.valgrindrc
Expand All @@ -64,6 +68,7 @@
/llvm/
/mingw-build/
/nd/
/obj/
/rt/
/rustllvm/
/src/libunicode/DerivedCoreProperties.txt
Expand All @@ -72,13 +77,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
Expand All @@ -88,11 +90,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