From 296e97d0995f42a2c5f321471f02f928eb82e56e Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@mandriva.com>
Date: Mon, 29 May 2006 12:07:48 +0000
Subject: Generated by cvs2cl the 29_May

---
 ChangeLog | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 0205abd..98f5b7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-05-29 14:07  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec: - Add legacy directories and default
+	  merge directory
+
+2006-05-29 14:06  Frederic Crozat <fcrozat at mandriva.com>
+
+	* menu/applications-mdk.menu: Add back legacy directories
+
+2006-05-17 19:09  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec: Fix errors in install script
+
 2006-05-17 19:01  Frederic Crozat <fcrozat at mandriva.com>
 
 	* desktop-common-data.spec: - ship our own .directory files now -
-- 
cgit v1.2.1