]> Pileus Git - ~andy/gtk/commit
remove conflict marker
authorJonathan Blandford <jrb@src.gnome.org>
Sat, 28 Feb 2004 04:27:23 +0000 (04:27 +0000)
committerJonathan Blandford <jrb@src.gnome.org>
Sat, 28 Feb 2004 04:27:23 +0000 (04:27 +0000)
commitdeb3d9e5064d6cedd6f1307087665b0be9219920
tree4c545b690e35c990f6e3c9ccea662b3072ebf4c2
parentfe3e1c95fa97aa1417ce3e849121934a886ddfcc
remove conflict marker
ChangeLog
ChangeLog.pre-2-10
ChangeLog.pre-2-4
ChangeLog.pre-2-6
ChangeLog.pre-2-8