9422f35 Merge branch 'master' of ssh://pkgs.fedoraproject.org/naev-data

Merged and Committed by Jonathan Dieter 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/naev-data
    
    Conflicts:
    	.gitignore
    	sources
    
        
file modified
+4 -1