ryujinx/GtkSharp
1
0
Fork 0
mirror of https://github.com/Ryujinx/GtkSharp.git synced 2025-01-12 08:15:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

oops, remove conflict markers

Browse source 
svn path=/trunk/gtk-sharp/; revision=45768
This commit is contained in:
Dan Winship 2005-06-10 15:47:17 +00:00
parent cb427b5747
commit 4552421529
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,4 +1,3 @@
<<<<<<< .mine
2005-06-10 Dan Winship <danw@novell.com> 2005-06-10 Dan Winship <danw@novell.com>
* parser/gapi2xml.pl (addPropElem): Distinguish CONSTRUCT ("must * parser/gapi2xml.pl (addPropElem): Distinguish CONSTRUCT ("must
@ -11,13 +10,11 @@
* gtk/gtk-api-2.6.raw: Regen, causing a few formerly-read-only * gtk/gtk-api-2.6.raw: Regen, causing a few formerly-read-only
properties to become writable. properties to become writable.
=======
2005-06-10 Mike Kestner <mkestner@novell.com> 2005-06-10 Mike Kestner <mkestner@novell.com>
* glade/XML.custom : add a try block on field autoconnect to make it * glade/XML.custom : add a try block on field autoconnect to make it
easier to catch type mismatches and such. Suggestion from Gonzalito. easier to catch type mismatches and such. Suggestion from Gonzalito.
>>>>>>> .r45766
2005-06-09 Lluis Sanchez <lluis@novell.com> 2005-06-09 Lluis Sanchez <lluis@novell.com>
* glib/Marshaller.cs: Added null check in FilenamePtrToString. * glib/Marshaller.cs: Added null check in FilenamePtrToString.