diff options
| author | Eli Zaretskii | 2013-12-11 19:06:29 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-12-11 19:06:29 +0200 |
| commit | a34a8cd1e46594c5776f187dd98583bcb82f9bc0 (patch) | |
| tree | 92503ed7f7d3fb3c73c38d4689611b8202682970 /admin/ChangeLog | |
| parent | 8b55eeeb70be4b4ff3dd4694013bdb1a9f668bc6 (diff) | |
| parent | 1421be8445803bdb9c3fece8c658836b5f0f9c34 (diff) | |
| download | emacs-a34a8cd1e46594c5776f187dd98583bcb82f9bc0.tar.gz emacs-a34a8cd1e46594c5776f187dd98583bcb82f9bc0.zip | |
Merge from trunk.
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 730253e616f..22824995dfc 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-12-11 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Remove the option of using libcrypto. | ||
| 4 | * merge-gnulib: Remove lib/gl_openssh.h and m4/gl-openssl.m4. | ||
| 5 | |||
| 1 | 2013-12-04 Eli Zaretskii <eliz@gnu.org> | 6 | 2013-12-04 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * unidata/unidata-gen.el (unidata-prop-alist): Update bidi-class | 8 | * unidata/unidata-gen.el (unidata-prop-alist): Update bidi-class |