gobject-introspection r542 - trunk/girepository

[walters svn gnome org]

Author: walters
Date: Sat Aug 30 20:31:10 2008
New Revision: 542
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=542&view=rev

Log:
Don't lose on NULL shlib


Modified:
   trunk/girepository/gtypelib.c

Modified: trunk/girepository/gtypelib.c
==============================================================================
--- trunk/girepository/gtypelib.c	(original)
+++ trunk/girepository/gtypelib.c	Sat Aug 30 20:31:10 2008
@@ -1962,7 +1962,11 @@
             }
         }
      
+<<<<<<< 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;