From 7338cf4a2972b3b0938816a3f7a517303c985e43 Mon Sep 17 00:00:00 2001
From: Chmouel Boudjnah <chmouel@mandriva.org>
Date: Thu, 25 May 2000 14:13:37 +0000
Subject: "Seethechangelog"

---
 perl-install/ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'perl-install/ChangeLog')

diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 90bfa7245..f7f427140 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-25  Chmouel Boudjnah  <chmouel@mandrakesoft.com>
+
+	* standalone/drakboot: Don't display Configure-/LILO/GRUB/ on
+	alpha|sparc.
+
 2000-05-25  François Pons  <fpons@mandrakesoft.com>
 
 	* silo.pm: added configure_entry to try creating an initrd for an image
@@ -18,6 +23,7 @@
 	* partition_table_sun.pm: fixed a bug when reading partition table
 	with unused partition in the middle of the table.
 
+>>>>>>> 1.114
 2000-05-23  François Pons  <fpons@mandrakesoft.com>
 
 	* common.pm: update arch to take into account sparc and sparc64. added
-- 
cgit v1.2.1