diff options
| author | Eli Zaretskii | 2013-03-31 15:36:07 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-03-31 15:36:07 +0300 |
| commit | 65d72c1bf862d339d72d760e7ac8ccbc4837f06b (patch) | |
| tree | 3d902ee01eda40ee5975dc42277e2495cef2996c /etc | |
| parent | f1aa11971a74b7b2fa0f5baaaaf21dfbd388de6b (diff) | |
| parent | 6ea3f01e74cbae9dc1366a07aea09d9665167981 (diff) | |
| download | emacs-65d72c1bf862d339d72d760e7ac8ccbc4837f06b.tar.gz emacs-65d72c1bf862d339d72d760e7ac8ccbc4837f06b.zip | |
Merge from trunk.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index 92f31e6c6e8..5b55e35397b 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | 2013-03-29 Aidan Gauland <aidalgol@no8wireless.co.nz> | 5 | 2013-03-29 Aidan Gauland <aidalgol@no8wireless.co.nz> |
| 6 | 6 | ||
| 7 | * NEWS: Added entry for em-tramp change in 2013-03-26T22:08:58Z!aidalgol@no8wireless.co.nz | 7 | * NEWS (Eshell): New entry for em-tramp change in 2013-03-26T22:08:58Z!aidalgol@no8wireless.co.nz |
| 8 | 8 | ||
| 9 | 2013-03-21 Eric Ludlam <zappo@gnu.org> | 9 | 2013-03-21 Eric Ludlam <zappo@gnu.org> |
| 10 | 10 | ||