diff options
| author | Glenn Morris | 2014-08-14 21:34:06 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-08-14 21:34:06 -0700 |
| commit | ed30c57cc9cdcf8ddc169f4b042146db9b3b7179 (patch) | |
| tree | 30e07052f35dcfb7c4616a30c8e9bdebb8a3526c /src/ChangeLog | |
| parent | b9558683e3339fb95ff9cad1ced705f525d86d7a (diff) | |
| parent | 315865d31dde9f0771f96a98a4562bd282aa21ea (diff) | |
| download | emacs-ed30c57cc9cdcf8ddc169f4b042146db9b3b7179.tar.gz emacs-ed30c57cc9cdcf8ddc169f4b042146db9b3b7179.zip | |
Merge from emacs-24; up to 2014-06-29T18:32:35Z!michael.albinus@gmx.de
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 b3d38fa0310..91b72e479d7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-08-15 Ken Brown <kbrown@cornell.edu> | ||
| 2 | |||
| 3 | * gmalloc.c (_malloc_mutex, _aligned_blocks_mutex) [CYGWIN]: Use | ||
| 4 | ERRORCHECK mutexes. (Bug#18222) | ||
| 5 | |||
| 1 | 2014-08-12 Martin Rudalics <rudalics@gmx.at> | 6 | 2014-08-12 Martin Rudalics <rudalics@gmx.at> |
| 2 | 7 | ||
| 3 | * frame.c (set_menu_bar_lines_1): Remove. | 8 | * frame.c (set_menu_bar_lines_1): Remove. |