diff options
| author | Arturo Espinosa <unammx@src.gnome.org> | 1998-09-16 23:34:03 +0000 |
|---|---|---|
| committer | Arturo Espinosa <unammx@src.gnome.org> | 1998-09-16 23:34:03 +0000 |
| commit | 0b54ffa9d6bc9beb8b13eda2365e00e2de8ff5ca (patch) | |
| tree | 75726ea471a4e15e2d9bb09324b174aff268464f /ChangeLog.pre-2-2 | |
| parent | bf69ab9d687ec505aa6d51fbcf8c2470ce25bd8b (diff) | |
| download | gdk-pixbuf-0b54ffa9d6bc9beb8b13eda2365e00e2de8ff5ca.tar.gz | |
sync
Diffstat (limited to 'ChangeLog.pre-2-2')
| -rw-r--r-- | ChangeLog.pre-2-2 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 88c48a3d3..b92dbee6f 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -63,7 +63,6 @@ Mon Sep 14 21:47:35 CDT 1998 Shawn T. Amundson <amundson@gtk.org> free()s. X itself uses free() on some of the malloced memory. ->>>>>>> 1.633 Sat Sep 12 10:44:06 1998 Owen Taylor <otaylor@redhat.com> * gtkfilesel.c: Maintain a list of directories like |