]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'e2cd766ca1b9bb2ba72aca5f6ba5d8be15743984'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 12:57:08 +0000 (14:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 12:57:23 +0000 (14:57 +0200)
* commit 'e2cd766ca1b9bb2ba72aca5f6ba5d8be15743984':
  configure: Mention that icl does not build both static and shared libs

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

diff --cc configure
Simple merge