diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2020-11-01 13:18:38 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2020-11-01 13:18:38 -0700 |
commit | 12e1bc6b16755daf87c97b4c7e4daee67b0276ca (patch) | |
tree | bca0f32a17e9bbe442ecefae32d798fbb25b670a /.gitignore | |
parent | 8086a82f24a5d3cb9cad9ce98d93ffa38b1188fb (diff) | |
parent | 7baf8cae0f54502fc2b21c01e133308b746cd7a0 (diff) | |
download | emacs-12e1bc6b16755daf87c97b4c7e4daee67b0276ca.tar.gz |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 8480045d915..f7a877e6476 100644 --- a/.gitignore +++ b/.gitignore @@ -157,7 +157,7 @@ test/manual/etags/regexfile test/manual/etags/ETAGS test/manual/etags/CTAGS test/manual/indent/*.new -test/data/mml-sec/random_seed +test/lisp/gnus/mml-sec-resources/random_seed # ctags, etags. TAGS @@ -169,6 +169,12 @@ GSYMS GRTAGS GTAGS +# auto-generated compilation database +compile_commands.json + +# ccls, a LSP-compliant server for C +/.ccls-cache + # GNU idutils. ID |