aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorKenichi Handa2010-05-19 10:16:01 +0900
committerKenichi Handa2010-05-19 10:16:01 +0900
commit9ba3dd48988911d24100dad2b67e5b45189083dd (patch)
treeea1334ba49103db7820757424f7043fd62333890 /etc
parent134d1bcded02e066727ece838f14ffc767f76419 (diff)
parent134c2f29cef985c940bd9496a1e69dff850b80a3 (diff)
downloademacs-9ba3dd48988911d24100dad2b67e5b45189083dd.tar.gz
emacs-9ba3dd48988911d24100dad2b67e5b45189083dd.zip
merge trunk
Diffstat (limited to 'etc')
-rw-r--r--etc/NEWS4
1 files changed, 3 insertions, 1 deletions
diff --git a/etc/NEWS b/etc/NEWS
index df68e42cd66..0d07a160ac1 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -214,7 +214,9 @@ threads simultaneously.
214 214
215** secrets.el is an implementation of the Secret Service API, an 215** secrets.el is an implementation of the Secret Service API, an
216interface to password managers like GNOME Keyring or KDE Wallet. The 216interface to password managers like GNOME Keyring or KDE Wallet. The
217Secret Service API requires D-Bus for communication. 217Secret Service API requires D-Bus for communication. The command
218`secrets-show-secrets' offers a buffer with a visualization of the
219secrets.
218 220
219 221
220* Incompatible Lisp Changes in Emacs 24.1 222* Incompatible Lisp Changes in Emacs 24.1