deb9f5f Merge branch 'master' into f19

Merged and Committed by Peter Hutterer 10 years ago
1 file changed. 7 lines added. 1 lines removed.
    Merge branch 'master' into f19
    
    Conflicts:
    	libXres.spec
    
        
file modified
+7 -1