Merge commit '390acbea0697a60300f249602dbf701e04274693'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 01:22:16 +0000 (02:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 01:22:16 +0000 (02:22 +0100)
commit3a05d7a9e583b8f5fee361d97d6793cf01974af2
tree6855aa6fd116a6b85fc3c9372939380bbcd5e5ac
parent85e1368f57a6611f0671f7581b82af34ac289494
parent390acbea0697a60300f249602dbf701e04274693
Merge commit '390acbea0697a60300f249602dbf701e04274693'

* commit '390acbea0697a60300f249602dbf701e04274693':
  configure: Provide --pkg-config-flags

Conflicts:
configure

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