Skip to content
Snippets Groups Projects
Commit 07ab8d33 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge remote-tracking branch 'cehoyos/master' 


* cehoyos/master:
  Revert "build: disable iconv by default."

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents f0a5f710 3f78f090
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
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