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 /etc/ChangeLog | |
| parent | 7aa7fff0c8860b72a2c7cdc7d4d0845245754d43 (diff) | |
| parent | 86b192c1479d167c13edb9cdaa026c231c8a0442 (diff) | |
| download | emacs-d2067333246b676fcf98567d34eec79ed4648d5f.tar.gz emacs-d2067333246b676fcf98567d34eec79ed4648d5f.zip | |
Merge from mainline.
Diffstat (limited to 'etc/ChangeLog')
| -rw-r--r-- | etc/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index d477f8e3d36..c201772cd93 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-07-26 Micah Anderson <micah@riseup.net> (tiny change) | ||
| 2 | |||
| 3 | * spook.lines: Additions. (Bug#14658) | ||
| 4 | |||
| 1 | 2013-07-16 Jan Djärv <jan.h.d@swipnet.se> | 5 | 2013-07-16 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 6 | ||
| 3 | * NEWS: Document blink-cursor-blinks and blink timers stopped. | 7 | * NEWS: Document blink-cursor-blinks and blink timers stopped. |