Merge commit '749b1f1359b5af0a08221923b016551b18ab6171'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Aug 2014 20:46:06 +0000 (22:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Aug 2014 20:46:06 +0000 (22:46 +0200)
commit2e3c1699aea7bb5a72d18903f4b8d3d33964c14d
treeb962791b6359f894afe99edee9689199b7016d0f
parente3601ceeb87516ac141605a41193aa4d726a2cf8
parent749b1f1359b5af0a08221923b016551b18ab6171
Merge commit '749b1f1359b5af0a08221923b016551b18ab6171'

* commit '749b1f1359b5af0a08221923b016551b18ab6171':
  configure: add --enable-rpath

Conflicts:
configure

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