diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | ChangeLog | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index cd60123e1c5..a35ab93c879 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -102,6 +102,7 @@ src/stamp-h1 | |||
| 102 | *.dSYM/ | 102 | *.dSYM/ |
| 103 | *.elc | 103 | *.elc |
| 104 | *.o | 104 | *.o |
| 105 | *.res | ||
| 105 | oo/ | 106 | oo/ |
| 106 | oo-spd/ | 107 | oo-spd/ |
| 107 | src/*.map | 108 | src/*.map |
| @@ -123,6 +124,7 @@ src/bootstrap-emacs | |||
| 123 | src/emacs | 124 | src/emacs |
| 124 | src/emacs-[0-9]* | 125 | src/emacs-[0-9]* |
| 125 | src/temacs | 126 | src/temacs |
| 127 | *.exe | ||
| 126 | 128 | ||
| 127 | # Character-set info. | 129 | # Character-set info. |
| 128 | admin/charsets/*.el | 130 | admin/charsets/*.el |
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-11-19 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * .gitignore: Resurrect Windows-specific ignorables lost in last | ||
| 4 | changes. | ||
| 5 | |||
| 1 | 2014-11-19 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2014-11-19 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | * .gitignore: Add /emacs-[1-9]*/, and sort better. | 8 | * .gitignore: Add /emacs-[1-9]*/, and sort better. |