diff options
| author | Paul Eggert | 2014-11-14 12:18:44 -0800 |
|---|---|---|
| committer | Paul Eggert | 2014-11-14 12:25:10 -0800 |
| commit | 9bcde6cdcaa0494aaac20ff23101577aa80de5b0 (patch) | |
| tree | 40a8d684ffbfa722e31db3237837e40b9566720b | |
| parent | c28ef9a4662324fe77910e6c82b72cef0c2aa7df (diff) | |
| download | emacs-9bcde6cdcaa0494aaac20ff23101577aa80de5b0.tar.gz emacs-9bcde6cdcaa0494aaac20ff23101577aa80de5b0.zip | |
* .gitignore: Add emacs-[1-9]*, to ignore files like emacs-25.0.50.1.
| -rw-r--r-- | src/.gitignore | 1 | ||||
| -rw-r--r-- | src/ChangeLog | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/.gitignore b/src/.gitignore index ebacd571ddd..0942abfb44e 100644 --- a/src/.gitignore +++ b/src/.gitignore | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | buildobj.h | 1 | buildobj.h |
| 2 | config.h | 2 | config.h |
| 3 | emacs-[1-9]* | ||
| 3 | epaths.h | 4 | epaths.h |
| 4 | stamp_BLD | 5 | stamp_BLD |
| 5 | stamp-h.in | 6 | stamp-h.in |
diff --git a/src/ChangeLog b/src/ChangeLog index 6f105ead811..3bcac1bff33 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-11-14 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * .gitignore: Add emacs-[1-9]*, to ignore files like emacs-25.0.50.1. | ||
| 4 | |||
| 1 | 2014-11-14 Dmitry Antipov <dmantipov@yandex.ru> | 5 | 2014-11-14 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 6 | ||
| 3 | * xfont.c (xfont_list_pattern): Do not allocate font entity object | 7 | * xfont.c (xfont_list_pattern): Do not allocate font entity object |