81b18e3 Merge branch 'master' of ssh://pkgs.fedoraproject.org/bwa

Merged and Committed by verdurin 10 years ago
1 file changed. 19 lines added. 6 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/bwa
    
    Conflicts:
    	bwa.spec
    
        
file modified
+19 -6