]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '9f4a16c52ea8f2383244587ea4cb534fe7f6da49'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Jun 2013 09:34:08 +0000 (11:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Jun 2013 09:34:14 +0000 (11:34 +0200)
* commit '9f4a16c52ea8f2383244587ea4cb534fe7f6da49':
  configure: Do not explicitly set Oy for msvc/icl

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

diff --cc configure
Simple merge