diff options
| author | Glenn Morris | 2014-05-07 20:41:21 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-05-07 20:41:21 -0700 |
| commit | fb3f83f5fd9e80347c8b8e36f6eaefbb912fe57b (patch) | |
| tree | f106c360c3aef01bcacdc77b66b7c5b20261502e /lib-src/ChangeLog | |
| parent | 1ba38c429fa6ce17568771ef51c8e53b1a72bb94 (diff) | |
| parent | 606695a67801acfd1792110e4ea3228b50b0117d (diff) | |
| download | emacs-fb3f83f5fd9e80347c8b8e36f6eaefbb912fe57b.tar.gz emacs-fb3f83f5fd9e80347c8b8e36f6eaefbb912fe57b.zip | |
Merge from emacs-24; up to 2014-05-08T03:34:20Z!rgm@gnu.org
Diffstat (limited to 'lib-src/ChangeLog')
| -rw-r--r-- | lib-src/ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index b16f881c4de..f571b401584 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -705,7 +705,7 @@ | |||
| 705 | Use _Noreturn rather than NO_RETURN. | 705 | Use _Noreturn rather than NO_RETURN. |
| 706 | No need for separate decl merely because of _Noreturn. | 706 | No need for separate decl merely because of _Noreturn. |
| 707 | 707 | ||
| 708 | 2012-06-24 Samuel Bronson <naesten@gmail.com> (tiny change) | 708 | 2012-06-24 Samuel Bronson <naesten@gmail.com> |
| 709 | 709 | ||
| 710 | * emacsclient.c (set_local_socket): Fix compiler warning (Bug#7838). | 710 | * emacsclient.c (set_local_socket): Fix compiler warning (Bug#7838). |
| 711 | 711 | ||