07763eb Merge branch 'master' of ssh://pkgs.fedoraproject.org/jna

Merged and Committed by lfarkas 13 years ago
1 file changed. 6 lines added. 3 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/jna
    
    Conflicts:
    	jna.spec
    
        
file modified
+6 -3