diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-01-24 17:29:49 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-01-24 17:29:49 -0700 |
| commit | 28c45a6d4f28160966126a0a35ba66d196f9ea6d (patch) | |
| tree | 683d0a697d36460e67f619f27fd19c6b8cf5510e /.gitignore | |
| parent | eaed49aa4183a4eca35ff0635c268d014e78f634 (diff) | |
| parent | 667e212048a1443b6f72647176aec701d18474c9 (diff) | |
| download | emacs-28c45a6d4f28160966126a0a35ba66d196f9ea6d.tar.gz | |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index c53d53a972a..1cc5e3e4de9 100644 --- a/.gitignore +++ b/.gitignore @@ -226,6 +226,7 @@ lisp/international/emoji-zwj.el lisp/international/emoji-labels.el lisp/international/eucjp-ms.el lisp/international/uni-*.el +lisp/international/idna-mapping.el lisp/language/pinyin.el # Documentation. |