diff options
| author | Paul Eggert | 2011-05-03 23:13:23 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-05-03 23:13:23 -0700 |
| commit | 53a35e81c90cec67a21bbc8518bc516ed335d756 (patch) | |
| tree | bdf44bf84d4a2c11efdce99245da34e39cb17041 /src/ChangeLog | |
| parent | 19548d0861ced228dd0598240a410bf6a720b59e (diff) | |
| parent | f330b642bb28e3b9ee5e14ac55c8103e6dcde412 (diff) | |
| download | emacs-53a35e81c90cec67a21bbc8518bc516ed335d756.tar.gz emacs-53a35e81c90cec67a21bbc8518bc516ed335d756.zip | |
Merge from mainline.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c1f43f4313d..f8135ee2ab0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -108,6 +108,12 @@ | |||
| 108 | 108 | ||
| 109 | * fns.c (Frandom): Let EMACS_UINT be wider than unsigned long. | 109 | * fns.c (Frandom): Let EMACS_UINT be wider than unsigned long. |
| 110 | 110 | ||
| 111 | 2011-05-04 Teodor Zlatanov <tzz@lifelogs.com> | ||
| 112 | |||
| 113 | * gnutls.c (Fgnutls_boot): Support :keylist and :crlfiles options | ||
| 114 | instead of :keyfiles. Give GnuTLS the keylist and the CRL lists | ||
| 115 | as passed in. | ||
| 116 | |||
| 111 | 2011-05-03 Jan Djärv <jan.h.d@swipnet.se> | 117 | 2011-05-03 Jan Djärv <jan.h.d@swipnet.se> |
| 112 | 118 | ||
| 113 | * xterm.c (x_set_frame_alpha): Do not set property on anything | 119 | * xterm.c (x_set_frame_alpha): Do not set property on anything |