Commit 85430738 authored by Feng Xiao's avatar Feng Xiao
Browse files

Merge pull request #369 from ensonic/master 

Uncomment conflict fields from pkg-config files.
parents cd141089 37e7a3c4
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment