f0de298 Merge branch 'master' into f17

Merged and Committed by jsynacek 11 years ago
    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	sources
    	warzone2100.spec
    
        
file modified
+2 -0
file modified
+1 -1
file modified
+13 -3