From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 23 Jun 2013 11:45:39 +0000 (+0200)
Subject: Merge remote-tracking branch 'qatar/master'
X-Git-Tag: n2.0~313
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/fb0df5c113e0dff2311201dc828db1648174972b

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: More msvc/icl combining

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

fb0df5c113e0dff2311201dc828db1648174972b