diff etc/ChangeLog @ 5923:61d7d7bcbe76 cygwin

merged heads after pull -u
author Henry Thompson <ht@markup.co.uk>
date Thu, 05 Feb 2015 17:19:05 +0000
parents bf1e13811159
children
line wrap: on
line diff
--- a/etc/ChangeLog	Wed Apr 23 22:22:37 2014 +0100
+++ b/etc/ChangeLog	Thu Feb 05 17:19:05 2015 +0000
@@ -1,3 +1,9 @@
+2014-12-05  Jerry James  <james@xemacs.org>
+
+	* xemacs.appdata.xml:
+	* xemacs.desktop:
+	* xemacs-icon.svg: New files for distribution packaging.
+
 2013-06-23  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.34 "kale" is released.