From f0b087481e25833558f2d3fd1c7ba56677f914f6 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Wed, 4 Oct 2000 11:24:03 +0000
Subject: *** empty log message ***

---
 perl-install/ChangeLog | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'perl-install/ChangeLog')

diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 99a1fb1e9..79e5081cf 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-04  François Pons  <fpons@mandrakesoft.com>
+
+	* Xconfigurator.pm: removed bad card for 3D Rage Pro.
+
 2000-10-04  DrakX <install@linux-mandrake.com>
 
 	* snapshot uploaded
@@ -71,7 +75,6 @@
 
 	* share/Cards+: fixed Savage2000 entry.
 
->>>>>>> 1.300
 2000-10-03  DrakX <install@linux-mandrake.com>
 
 	* snapshot uploaded
-- 
cgit v1.2.1