diff options
author | Yuuki Harano <masm+github@masm11.me> | 2021-11-11 00:39:53 +0900 |
---|---|---|
committer | Yuuki Harano <masm+github@masm11.me> | 2021-11-11 00:39:53 +0900 |
commit | 4dd1f56f29fc598a8339a345c2f8945250600602 (patch) | |
tree | af341efedffe027e533b1bcc0dbf270532e48285 /.gitignore | |
parent | 4c49ec7f865bdad1629d2f125f71f4e506b258f2 (diff) | |
parent | 810fa21d26453f898de9747ece7205dfe6de9d08 (diff) | |
download | emacs-4dd1f56f29fc598a8339a345c2f8945250600602.tar.gz emacs-4dd1f56f29fc598a8339a345c2f8945250600602.tar.bz2 emacs-4dd1f56f29fc598a8339a345c2f8945250600602.zip |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 1bc33383cb3..e32425abeab 100644 --- a/.gitignore +++ b/.gitignore @@ -65,6 +65,7 @@ lib/ieee754.h lib/inttypes.h lib/libgnu.a lib/limits.h +lib/malloc/*.gl.h lib/signal.h lib/std*.h !lib/std*.in.h @@ -143,6 +144,7 @@ src/gl-stamp core core.*[0-9] gmon.out +native-lisp/ oo/ oo-spd/ src/*.map @@ -212,6 +214,8 @@ etc/charsets/*.map lisp/international/charprop.el lisp/international/charscript.el lisp/international/cp51932.el +lisp/international/emoji-zwj.el +lisp/international/emoji-labels.el lisp/international/eucjp-ms.el lisp/international/uni-*.el lisp/language/pinyin.el |