85ef65c Merge branch 'master' of ssh://pkgs.fedoraproject.org/mingw32-glib2

Merged and Committed by sailer 13 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/mingw32-glib2
    
    Conflicts:
    	.gitignore
    	mingw32-glib2.spec
    	sources
    
        
file modified
+4 -1
file modified
+52 -2