git.ffmpeg.org Git - ffmpeg.git/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Sun, 23 Jun 2013 11:45:39 +0000 (13:45 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Sun, 23 Jun 2013 11:45:46 +0000 (13:45 +0200)
commit	fb0df5c113e0dff2311201dc828db1648174972b
tree	92424a47e1814dbda2041e3e697d50a4f70d89d6	tree \| snapshot
parent	780b1aa1efa872ec7401735764795134427db1ab	commit \| diff
parent	f11e4045b9c40c57cade481fc8225ab35ccb5fe2	commit \| diff

Merge remote-tracking branch 'qatar/master'

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

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