]> git.sesse.net Git - ffmpeg/commit
Merge commit '0cff125200ab53fa3ae70d85b4f614f269fe3426'
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 26 Jul 2015 20:58:09 +0000 (22:58 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 26 Jul 2015 20:59:10 +0000 (22:59 +0200)
commit867686997cbacd06cf5056c2741494bda23a7819
tree296a2a8ad4dfafa935bdae672f80bdbe99f6706e
parent508c815d4db0a795444476a9e175b2e6d09bb35c
parent0cff125200ab53fa3ae70d85b4f614f269fe3426
Merge commit '0cff125200ab53fa3ae70d85b4f614f269fe3426'

* commit '0cff125200ab53fa3ae70d85b4f614f269fe3426':
  configure: Only add -FIstdlib.h for msvc/icl if necessary

Conflicts:
configure

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
configure