]> Pileus Git - ~andy/gtk/commit
Remove stale cvs conflict marker.
authorKristian Rietveld <kristian@src.gnome.org>
Sun, 24 Dec 2006 19:32:38 +0000 (19:32 +0000)
committerKristian Rietveld <kristian@src.gnome.org>
Sun, 24 Dec 2006 19:32:38 +0000 (19:32 +0000)
commit1e165879010a3563c377e3d7b480c048e5f58fa1
treea039b0ef2ec2f79bba586955aed581e180f9cfc2
parent5a64bf97e1e0df5f9bfc248be32a19e90424366f
Remove stale cvs conflict marker.
ChangeLog