summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--ChangeLog.pre-2-01
-rw-r--r--ChangeLog.pre-2-101
-rw-r--r--ChangeLog.pre-2-21
-rw-r--r--ChangeLog.pre-2-41
-rw-r--r--ChangeLog.pre-2-61
-rw-r--r--ChangeLog.pre-2-81
7 files changed, 0 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 62e9630f5d..a23318695e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -110,7 +110,6 @@
2000-07-25 Havoc Pennington <hp@redhat.com>
->>>>>>> 1.1355
* gtk/gtkprogressbar.h: Implement new sane, 5-function API for
using GtkProgressBar. See Changes-2.0.txt for details.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 62e9630f5d..a23318695e 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -110,7 +110,6 @@
2000-07-25 Havoc Pennington <hp@redhat.com>
->>>>>>> 1.1355
* gtk/gtkprogressbar.h: Implement new sane, 5-function API for
using GtkProgressBar. See Changes-2.0.txt for details.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 62e9630f5d..a23318695e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -110,7 +110,6 @@
2000-07-25 Havoc Pennington <hp@redhat.com>
->>>>>>> 1.1355
* gtk/gtkprogressbar.h: Implement new sane, 5-function API for
using GtkProgressBar. See Changes-2.0.txt for details.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 62e9630f5d..a23318695e 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -110,7 +110,6 @@
2000-07-25 Havoc Pennington <hp@redhat.com>
->>>>>>> 1.1355
* gtk/gtkprogressbar.h: Implement new sane, 5-function API for
using GtkProgressBar. See Changes-2.0.txt for details.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 62e9630f5d..a23318695e 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -110,7 +110,6 @@
2000-07-25 Havoc Pennington <hp@redhat.com>
->>>>>>> 1.1355
* gtk/gtkprogressbar.h: Implement new sane, 5-function API for
using GtkProgressBar. See Changes-2.0.txt for details.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 62e9630f5d..a23318695e 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -110,7 +110,6 @@
2000-07-25 Havoc Pennington <hp@redhat.com>
->>>>>>> 1.1355
* gtk/gtkprogressbar.h: Implement new sane, 5-function API for
using GtkProgressBar. See Changes-2.0.txt for details.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 62e9630f5d..a23318695e 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -110,7 +110,6 @@
2000-07-25 Havoc Pennington <hp@redhat.com>
->>>>>>> 1.1355
* gtk/gtkprogressbar.h: Implement new sane, 5-function API for
using GtkProgressBar. See Changes-2.0.txt for details.