diff options
| author | Joakim Verona | 2013-08-14 21:21:56 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-14 21:21:56 +0200 |
| commit | 0b15597dcec4aaa6c4f35138da2471f6dd4fb003 (patch) | |
| tree | da1c75008f53c7aa7363878bf87a6803708dee67 /src/ChangeLog | |
| parent | 1cd3338c8c8074c0c93c997e4430d441fdec4113 (diff) | |
| parent | 05e64f9f63f98108bb04f8ab45343e507862d8f4 (diff) | |
| download | emacs-0b15597dcec4aaa6c4f35138da2471f6dd4fb003.tar.gz emacs-0b15597dcec4aaa6c4f35138da2471f6dd4fb003.zip | |
merge from trunk
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 415c4c3f525..43e9bca061b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-08-14 Ken Brown <kbrown@cornell.edu> | ||
| 2 | |||
| 3 | * gmalloc.c (memalign) [CYGWIN]: Rename to emacs_memalign | ||
| 4 | (Bug#15094). | ||
| 5 | |||
| 1 | 2013-08-14 Dmitry Antipov <dmantipov@yandex.ru> | 6 | 2013-08-14 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 7 | ||
| 3 | Utility function and macro to copy Lisp string to C string. | 8 | Utility function and macro to copy Lisp string to C string. |