]> Pileus Git - ~andy/gtk/commit
remove conflict marker
authorKristian Rietveld <kristian@src.gnome.org>
Wed, 26 Apr 2006 12:22:01 +0000 (12:22 +0000)
committerKristian Rietveld <kristian@src.gnome.org>
Wed, 26 Apr 2006 12:22:01 +0000 (12:22 +0000)
commit3eac42f2d40ee410926d6cb620de62ce014c33bc
treed199e78b5fcdbb202b6e11ae9198e4bf4877517f
parentbc3db2f3ac62101f6e5ad18098f6a2d223ba081b
remove conflict marker
ChangeLog
ChangeLog.pre-2-10