summaryrefslogtreecommitdiff
path: root/ChangeLog.pre-2-0
diff options
context:
space:
mode:
authorRobert Brady <rbrady@src.gnome.org>2000-07-26 00:58:46 +0000
committerRobert Brady <rbrady@src.gnome.org>2000-07-26 00:58:46 +0000
commitcbc86c2b904bf6d3abdafb04e76433d614412885 (patch)
tree84a640de7db2532d27362b6cf3bc94ff6a3a1c14 /ChangeLog.pre-2-0
parent6c4f3568d52c91ca96d6448e448c0780c0c43019 (diff)
downloadgdk-pixbuf-cbc86c2b904bf6d3abdafb04e76433d614412885.tar.gz
remove <<<<. oops.
Diffstat (limited to 'ChangeLog.pre-2-0')
-rw-r--r--ChangeLog.pre-2-01
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 62e9630f5..a23318695 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.