aboutsummaryrefslogtreecommitdiffhomepage
path: root/.gitignore
diff options
context:
space:
mode:
authorGravatar Mark D. Roth <roth@google.com>2016-08-25 08:18:25 -0700
committerGravatar Mark D. Roth <roth@google.com>2016-08-25 08:18:25 -0700
commitf03b112d12d32f42b023a5c49d994438dde0a95e (patch)
tree979d4e64ecf7ed31495d635ea4caa7c037284f72 /.gitignore
parent7187ab9866f95181212cdb8b80fcbe0a36b01765 (diff)
parent19ea0cffd7ba3df686ed05671f9ed35b8e9fa830 (diff)
Merge remote-tracking branch 'upstream/master' into cq_verifier_file_line
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 09223fa1ea..ed015b3c92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
# C/C++ build outputs
+.build/
bins
gens
libs
@@ -99,3 +100,6 @@ artifacts/
# Git generated files for conflicting
*.orig
+
+# IDE specific folder for JetBrains IDEs
+.idea/