ryujinx/GtkSharp
1
0
Fork 0
mirror of https://github.com/Ryujinx/GtkSharp.git synced 2025-01-11 23:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove conflict marker.

Browse source 
svn path=/trunk/gtk-sharp/; revision=16136
This commit is contained in:
Duncan Mak 2003-07-12 09:23:26 +00:00
parent aa65123a95
commit 0c4b3dcae1
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/ChangeLog
View file

@ -1,4 +1,3 @@
<<<<<<< ChangeLog
2003-07-12 Duncan Mak <duncan@ximian.com> 2003-07-12 Duncan Mak <duncan@ximian.com>
* en/Gtk/TextBuffer.xml: all documented except for events. * en/Gtk/TextBuffer.xml: all documented except for events.