[Emacs-diffs] emacs-24 01/01: .gitignore: Resurrect Windows-specific ignorables lost in last changes.

[Eli Zaretskii]

branch: emacs-24
commit ff953bc93bb41ef573cd6962424ece340ad5a394
Author: Eli Zaretskii <address@hidden>
Date:   Wed Nov 19 21:13:34 2014 +0200

    .gitignore: Resurrect Windows-specific ignorables lost in last changes.
---
 .gitignore |    2 ++
 ChangeLog  |    5 +++++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index cd60123..a35ab93 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 ebc1497..fdf40a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-19  Eli Zaretskii  <address@hidden>
+
+       * .gitignore: Resurrect Windows-specific ignorables lost in last
+       changes.
+
 2014-11-19  Paul Eggert  <address@hidden>
 
        * .gitignore: Add /emacs-[1-9]*/, and sort better.