diff options
| author | Stefan Monnier | 2013-01-09 22:43:02 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2013-01-09 22:43:02 -0500 |
| commit | 3f9549e874035d963eb5ca02f24d51dc935e6326 (patch) | |
| tree | 1340657aa0689287b52f3dba9d8c6bc4da822c02 /etc | |
| parent | b14abca9476cba2f500b5eda89441d593dd0f12b (diff) | |
| parent | c4dd9efc9ed3f7de8f4ee74b6d47f65ad72320cf (diff) | |
| download | emacs-3f9549e874035d963eb5ca02f24d51dc935e6326.tar.gz emacs-3f9549e874035d963eb5ca02f24d51dc935e6326.zip | |
Merge from emacs-24
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 1c057848ead..6c1a08cb670 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog | |||
| @@ -85,7 +85,7 @@ | |||
| 85 | 85 | ||
| 86 | 2012-10-01 Eric Ludlam <zappo@gnu.org> | 86 | 2012-10-01 Eric Ludlam <zappo@gnu.org> |
| 87 | 87 | ||
| 88 | * srecode/cc.srt, srecode/ede-autoconf.srt: New files. | 88 | * srecode/c.srt, srecode/ede-autoconf.srt: New files. |
| 89 | 89 | ||
| 90 | * srecode/cpp.srt: Move parts to c.srt. | 90 | * srecode/cpp.srt: Move parts to c.srt. |
| 91 | 91 | ||