Merge commit '5926603ad65e5fd4fefe8f0d72c381059f71cd59'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 20:12:42 +0000 (21:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 20:12:57 +0000 (21:12 +0100)
commita1b92569db6597bb4a662865564e7905a945264f
tree985ad06b36f264cea58e3bfb96a2fc0418110cb6
parent28ee7757f5b0859510e3af6bf49fca9881f09966
parent5926603ad65e5fd4fefe8f0d72c381059f71cd59
Merge commit '5926603ad65e5fd4fefe8f0d72c381059f71cd59'

* commit '5926603ad65e5fd4fefe8f0d72c381059f71cd59':
  configure: Document --pkg-config option

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure