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

Merge branch 'master' into 'patch-1' 

# Conflicts:
#   recipes/libpng/recipe.sh
parents da2ba61b 574b12be
No related branches found
No related tags found
1 merge request!196Running autogen.sh seems to break the build when building in docker
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