diff options
| author | Paul Eggert | 2013-08-01 23:24:02 +0100 |
|---|---|---|
| committer | Paul Eggert | 2013-08-01 23:24:02 +0100 |
| commit | 6318cde023c4ffff777dde20768046e057d85448 (patch) | |
| tree | 182f5f5fe9d02f41a31804e543d2a2944400ca8d /src/ChangeLog | |
| parent | 5f648ab4b0a3f55c0e85253fb0d6a6f8b8326c12 (diff) | |
| download | emacs-6318cde023c4ffff777dde20768046e057d85448.tar.gz emacs-6318cde023c4ffff777dde20768046e057d85448.zip | |
* fileio.c, fns.c (merge): Move extern decl from here ...
* lisp.h (merge): ... to here.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index abc54196eb0..c8626802af6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-08-01 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * fileio.c, fns.c (merge): Move extern decl from here ... | ||
| 4 | * lisp.h (merge): ... to here. | ||
| 5 | |||
| 1 | 2013-08-01 Dmitry Antipov <dmantipov@yandex.ru> | 6 | 2013-08-01 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 7 | ||
| 3 | Fix last font-related change. | 8 | Fix last font-related change. |