diff options
| author | Glenn Morris | 2011-06-25 11:21:00 -0700 |
|---|---|---|
| committer | Glenn Morris | 2011-06-25 11:21:00 -0700 |
| commit | 11fdef7d0cf3ef1ce30d1cd09ca9ca9a2b099d20 (patch) | |
| tree | 4359edf5c3e99c0abcf9eff028a7a2609f483745 /doc/lispref/ChangeLog | |
| parent | 3794a2d3a43433c27f65c902bfdc21479d7d309f (diff) | |
| parent | c9e799dbb100c5161f7a485452d29f554d95e6c7 (diff) | |
| download | emacs-11fdef7d0cf3ef1ce30d1cd09ca9ca9a2b099d20.tar.gz emacs-11fdef7d0cf3ef1ce30d1cd09ca9ca9a2b099d20.zip | |
Merge from emacs-23; up to 2010-06-15T03:34:12Z!rgm@gnu.org.
Diffstat (limited to 'doc/lispref/ChangeLog')
| -rw-r--r-- | doc/lispref/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index b6b02686caf..7946e4b91ff 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-06-25 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * keymaps.texi (Searching Keymaps): | ||
| 4 | * display.texi (Overlay Properties): Fix errors in 2011-05-29 | ||
| 5 | change. Suggested by Johan Bockgård. | ||
| 6 | |||
| 1 | 2011-06-15 Chong Yidong <cyd@stupidchicken.com> | 7 | 2011-06-15 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 8 | ||
| 3 | * text.texi (Special Properties): Clarify role of font-lock-face. | 9 | * text.texi (Special Properties): Clarify role of font-lock-face. |