]> Pileus Git - ~andy/gtk/commit
remove conflict marker from ChangeLog
authorJonathan Blandford <jrb@src.gnome.org>
Tue, 18 Sep 2001 23:00:32 +0000 (23:00 +0000)
committerJonathan Blandford <jrb@src.gnome.org>
Tue, 18 Sep 2001 23:00:32 +0000 (23:00 +0000)
commit67ff460c0e5a2979a482cb6edd32d7e012f83b75
tree00f2175f322d88ddc6dfe17baa6a6691505f9e44
parentfa6e6928f6e3095ea795625d4791b1734896f8c0
remove conflict marker from ChangeLog
ChangeLog
ChangeLog.pre-2-0
ChangeLog.pre-2-10
ChangeLog.pre-2-2
ChangeLog.pre-2-4
ChangeLog.pre-2-6
ChangeLog.pre-2-8