diff options
| author | Xue Fuqiao | 2013-07-30 08:29:09 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-07-30 08:29:09 +0800 |
| commit | d2067333246b676fcf98567d34eec79ed4648d5f (patch) | |
| tree | ad6543d8e7f1db50226907f7278373eef544d252 /doc/lispref/ChangeLog | |
| parent | 7aa7fff0c8860b72a2c7cdc7d4d0845245754d43 (diff) | |
| parent | 86b192c1479d167c13edb9cdaa026c231c8a0442 (diff) | |
| download | emacs-d2067333246b676fcf98567d34eec79ed4648d5f.tar.gz emacs-d2067333246b676fcf98567d34eec79ed4648d5f.zip | |
Merge from mainline.
Diffstat (limited to 'doc/lispref/ChangeLog')
| -rw-r--r-- | doc/lispref/ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index d8d21794baa..32717946b04 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1080,7 +1080,7 @@ | |||
| 1080 | * display.texi (Face Attributes): Copyedits. Add a few cindex entries. | 1080 | * display.texi (Face Attributes): Copyedits. Add a few cindex entries. |
| 1081 | Overlining no longer behaves exactly like underlining. | 1081 | Overlining no longer behaves exactly like underlining. |
| 1082 | 1082 | ||
| 1083 | 2012-06-16 Aurelien Aptel <aurelien.aptel@gmail.com> | 1083 | 2012-06-16 Aurélien Aptel <aurelien.aptel@gmail.com> |
| 1084 | 1084 | ||
| 1085 | * display.texi (Face Attributes): | 1085 | * display.texi (Face Attributes): |
| 1086 | Document wave-style underline face attribute. | 1086 | Document wave-style underline face attribute. |