aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-04-25 05:09:57 -0700
committerbors-servo <lbergstrom+bors@mozilla.com>2016-04-25 05:09:57 -0700
commit0efbe5ece680ca515dcef95688a4b680a6a0df5e (patch)
tree15cbf7209b143af39af1f50680d829ce6d48644e
parent8bf732e633cc63dd56a8b6a9f503d694e4b569fe (diff)
parent0e9560e95404fadd22518394bd5efaf5158e1a7e (diff)
downloadservo-0efbe5ece680ca515dcef95688a4b680a6a0df5e.tar.gz
servo-0efbe5ece680ca515dcef95688a4b680a6a0df5e.zip
Auto merge of #10825 - craftytrickster:gitignore-update, r=Ms2ger
Adding vscode and intellij settings folders to gitignore I was going to try VSCode to see if the debugger works well or not with Rust. Since VSCode (as well as other editors) add their own project files to git, I figured they should be accounted for in the .gitignore file. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10825) <!-- Reviewable:end -->
-rw-r--r--.gitignore9
1 files changed, 9 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 80c42f83d31..e96d93837e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,12 @@ servo-test
Servo.app
.config.mk.last
/glfw
+
+# Editors
+
+# IntelliJ
+.idea
+*.iws
+
+# VSCode
+.vscode