Skip to content
Snippets Groups Projects
Commit 01c21e7e authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Merge branch 'samuela-master-patch-85258' into 'master' 

Make sure we're cross-compiling zlib

See merge request !233
parents b3d66183 729773db
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
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