diff --git a/.gitignore b/.gitignore index cd60123e1c5..a35ab93c879 100644 --- a/.gitignore +++ b/.gitignore @@ -102,6 +102,7 @@ src/stamp-h1 *.dSYM/ *.elc *.o +*.res oo/ oo-spd/ src/*.map @@ -123,6 +124,7 @@ src/bootstrap-emacs src/emacs src/emacs-[0-9]* src/temacs +*.exe # Character-set info. admin/charsets/*.el diff --git a/ChangeLog b/ChangeLog index ebc14977f7f..fdf40a172b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-11-19 Eli Zaretskii + + * .gitignore: Resurrect Windows-specific ignorables lost in last + changes. + 2014-11-19 Paul Eggert * .gitignore: Add /emacs-[1-9]*/, and sort better.