Skip to content
Commit c31c11ec authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

Merge pull request #23482 from rardiol/pcsxr 

pcsxr: remove name conflict with zlib 1.2.9
parents f39e718c 92d86807
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment