Merge commit '852c329a69ddfd635807f60454df07d021c64901'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Jun 2014 16:00:20 +0000 (18:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Jun 2014 16:00:20 +0000 (18:00 +0200)
commita68c05cf13c986b73b0932e8eb6aaf7f9cb0f37f
tree63091a4886ec73e1405fff4a346707236a9ec404
parent47c8d1e174b8677bb3c9f6e2ce0c37907b3a8886
parent852c329a69ddfd635807f60454df07d021c64901
Merge commit '852c329a69ddfd635807f60454df07d021c64901'

* commit '852c329a69ddfd635807f60454df07d021c64901':
  configure: Drop duplicate pkg-config entry from help output

Conflicts:
configure

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