aboutsummaryrefslogtreecommitdiffhomepage
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore10
1 files changed, 7 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 466f4c1a7..0e41d6a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -115,7 +115,7 @@ dev/ocamldoc/*.css
# .mll files
-grammar/coqpp_lex.ml
+coqpp/coqpp_lex.ml
dev/ocamlweb-doc/lex.ml
ide/coq_lex.ml
ide/config_lexer.ml
@@ -128,8 +128,8 @@ ide/protocol/xml_lexer.ml
# .mly files
-grammar/coqpp_parse.ml
-grammar/coqpp_parse.mli
+coqpp/coqpp_parse.ml
+coqpp/coqpp_parse.mli
# .ml4 / .mlp files
@@ -179,3 +179,7 @@ test-suite/.nra.cache
plugins/ssr/ssrparser.ml
plugins/ssr/ssrvernac.ml
+
+# ocaml dev files
+.merlin
+META.coq