luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 19:36:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't lose on NULL shlib

Browse Source 
svn path=/trunk/; revision=542
This commit is contained in:
Colin Walters 2008-08-30 20:31:10 +00:00
parent 6e656b4498
commit e6a68106a2
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtypelib.c
View File

@ -1962,7 +1962,11 @@ _g_typelib_init (GTypelib *typelib)
}
}
<<<<<<< HEAD:girepository/gtypelib.c
if (typelib->module == NULL && shlib != NULL)
=======
if (shlib != NULL && typelib->module == NULL)
>>>>>>> Don't lose on NULL shlib:girepository/gtypelib.c
{
GString *shlib_full;