diff options
| author | Glenn Morris | 2015-03-22 11:11:27 -0700 |
|---|---|---|
| committer | Glenn Morris | 2015-03-22 11:11:27 -0700 |
| commit | a4ff05a2172fc0c057ca9715d263c8b00fbf0218 (patch) | |
| tree | 90ebed1404065cf813d2423f2c10f1195804c5ca /src | |
| parent | bb7b23c5cbd0659a9e913ea4c4642bffe83541ef (diff) | |
| download | emacs-a4ff05a2172fc0c057ca9715d263c8b00fbf0218.tar.gz emacs-a4ff05a2172fc0c057ca9715d263c8b00fbf0218.zip | |
ChangeLog fix
No need to merge to trunk, since it corrects a backported entry that
should not appear in trunk.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 060486b4ab3..d09b9de34fa 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | 2015-03-22 John F Carr <jfc@mit.edu> | 1 | 2015-03-22 John F Carr <jfc@mit.edu> (tiny change) |
| 2 | 2 | ||
| 3 | * fontset.c (fontset_pattern_regexp): Backport: Replace + 1 with | 3 | * fontset.c (fontset_pattern_regexp): Backport: Replace + 1 with |
| 4 | + 3 in alloca (Bug#20156) (tiny change) | 4 | + 3 in alloca (Bug#20156). |
| 5 | 5 | ||
| 6 | 2015-03-12 Glenn Morris <rgm@gnu.org> | 6 | 2015-03-12 Glenn Morris <rgm@gnu.org> |
| 7 | 7 | ||