diff options
| author | Stefan Monnier | 2014-12-05 15:30:09 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2014-12-05 15:30:09 -0500 |
| commit | 4fda400e58339cdf962b5679bf05ebe62c6189c5 (patch) | |
| tree | 8588108b9046f7ec6747112cd30509466ea49459 /ChangeLog | |
| parent | 0d7b2c96d388f5a9b539df3cb7f4ef115e7010b7 (diff) | |
| parent | c1c2cee7c5ae1eff6edb198814423e55cb11cc73 (diff) | |
| download | emacs-4fda400e58339cdf962b5679bf05ebe62c6189c5.tar.gz emacs-4fda400e58339cdf962b5679bf05ebe62c6189c5.zip | |
Merge from emacs-24
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-12-05 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * .gitignore: Remove redundant pattern (subsumed by _*). | ||
| 4 | Avoid "**", as it requires Git 1.8.2 or later. | ||
| 5 | |||
| 6 | 2014-12-05 Paul Eggert <eggert@cs.ucla.edu> | ||
| 1 | 2014-12-05 Eli Zaretskii <eliz@gnu.org> | 7 | 2014-12-05 Eli Zaretskii <eliz@gnu.org> |
| 2 | 8 | ||
| 3 | * .gitignore: Ignore test/biditest.txt. | 9 | * .gitignore: Ignore test/biditest.txt. |