7d08fd8 Merge branch 'f18' of ssh://pkgs.fedoraproject.org/OpenImageIO into f18

Merged and Committed by hobbes1069 10 years ago
    Merge branch 'f18' of ssh://pkgs.fedoraproject.org/OpenImageIO into f18
    
    Conflicts:
    	OpenImageIO.spec
    
        
file modified
+9 -0