996b438 Merge branch 'master' of ssh://pkgs.fedoraproject.org/scorched3d

Merged and Committed by bruno 12 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/scorched3d
    
    Conflicts:
    	scorched3d.spec
    
        
file modified
+3 -0