aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad22a25cfd7..f559acb2ecc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-05-06 Glenn Morris <rgm@gnu.org>
2
3 * files.el (dir-locals-read-from-file):
4 Mention dir-locals in any error message.
5
12012-05-06 Chong Yidong <cyd@gnu.org> 62012-05-06 Chong Yidong <cyd@gnu.org>
2 7
3 * emacs-lisp/package.el (package-built-in-p): Handle the `emacs' 8 * emacs-lisp/package.el (package-built-in-p): Handle the `emacs'