From 15201b48c9dc01557df8fdbe014958d41426bbf7 Mon Sep 17 00:00:00 2001 From: Lars Hamann Date: Fri, 17 Jul 1998 16:07:08 +0000 Subject: [PATCH] Changelog fix --- ChangeLog | 1 - ChangeLog.pre-2-0 | 1 - ChangeLog.pre-2-10 | 1 - ChangeLog.pre-2-2 | 1 - ChangeLog.pre-2-4 | 1 - ChangeLog.pre-2-6 | 1 - ChangeLog.pre-2-8 | 1 - 7 files changed, 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25444e512e..5be1053849 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,7 +37,6 @@ Thu Jul 16 14:16:16 PDT 1998 Manish Singh it; --libs strips out redundant -L's properly (there was code in there to do it before, but it didn't work) ->>>>>>> 1.528 Thu Jul 16 18:24:41 1998 Tim Janik * gtk/gtknotebook.h: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 25444e512e..5be1053849 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -37,7 +37,6 @@ Thu Jul 16 14:16:16 PDT 1998 Manish Singh it; --libs strips out redundant -L's properly (there was code in there to do it before, but it didn't work) ->>>>>>> 1.528 Thu Jul 16 18:24:41 1998 Tim Janik * gtk/gtknotebook.h: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 25444e512e..5be1053849 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -37,7 +37,6 @@ Thu Jul 16 14:16:16 PDT 1998 Manish Singh it; --libs strips out redundant -L's properly (there was code in there to do it before, but it didn't work) ->>>>>>> 1.528 Thu Jul 16 18:24:41 1998 Tim Janik * gtk/gtknotebook.h: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 25444e512e..5be1053849 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -37,7 +37,6 @@ Thu Jul 16 14:16:16 PDT 1998 Manish Singh it; --libs strips out redundant -L's properly (there was code in there to do it before, but it didn't work) ->>>>>>> 1.528 Thu Jul 16 18:24:41 1998 Tim Janik * gtk/gtknotebook.h: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 25444e512e..5be1053849 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -37,7 +37,6 @@ Thu Jul 16 14:16:16 PDT 1998 Manish Singh it; --libs strips out redundant -L's properly (there was code in there to do it before, but it didn't work) ->>>>>>> 1.528 Thu Jul 16 18:24:41 1998 Tim Janik * gtk/gtknotebook.h: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 25444e512e..5be1053849 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -37,7 +37,6 @@ Thu Jul 16 14:16:16 PDT 1998 Manish Singh it; --libs strips out redundant -L's properly (there was code in there to do it before, but it didn't work) ->>>>>>> 1.528 Thu Jul 16 18:24:41 1998 Tim Janik * gtk/gtknotebook.h: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 25444e512e..5be1053849 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -37,7 +37,6 @@ Thu Jul 16 14:16:16 PDT 1998 Manish Singh it; --libs strips out redundant -L's properly (there was code in there to do it before, but it didn't work) ->>>>>>> 1.528 Thu Jul 16 18:24:41 1998 Tim Janik * gtk/gtknotebook.h: