diff lisp/ChangeLog @ 108433:04339e8c65fc

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sun, 14 Mar 2010 00:17:00 +0000
parents 51ddd70d1fa1
children bb307bf2e752
line wrap: on
line diff
--- a/lisp/ChangeLog	Sat Mar 13 11:15:58 2010 +0000
+++ b/lisp/ChangeLog	Sun Mar 14 00:17:00 2010 +0000
@@ -1,3 +1,9 @@
+2010-03-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	* Makefile.in (ELCFILES): Add net/secrets.elc.
+
+	* net/secrets.el: New file.
+
 2010-03-12  Chong Yidong  <cyd@stupidchicken.com>
 
 	* facemenu.el (list-colors-display, list-colors-print): New arg