diff nt/ChangeLog @ 108453:6ebf8ca9708b

Merge from mainline.
author Katsumi Yamaoka <katsumi@flagship2>
date Thu, 22 Apr 2010 12:19:18 +0000
parents 14e8111ba66e
children 0c1c81ee223e
line wrap: on
line diff
--- a/nt/ChangeLog	Wed Apr 14 14:49:40 2010 +0000
+++ b/nt/ChangeLog	Thu Apr 22 12:19:18 2010 +0000
@@ -1,3 +1,7 @@
+2010-04-20  Lewis Perin  <perin@panix.com>  (tiny change)
+
+	* emacs.manifest: Add trustInfo section to Windows manifest.
+
 2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
 
 	* Branch for 23.2.