]> Pileus Git - ~andy/gtk/commit
Removed conflict markers from ChangeLog.
authorSven Neumann <neo@src.gnome.org>
Sat, 12 Jan 2002 17:48:45 +0000 (17:48 +0000)
committerSven Neumann <neo@src.gnome.org>
Sat, 12 Jan 2002 17:48:45 +0000 (17:48 +0000)
commit79dbfed1585cb40ed9a3b15dcb98df2d58adc558
tree5bf3e00340d651635137326556867821845b86e3
parentaeceb39d474b39556ac3685c3320f174a7f781cf
Removed conflict markers 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