]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a74e3fc 2192ff8)
Merge commit '2192ff84dd720968108bc1ca54e239f4c94eb61d'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 11:00:03 +0000 (13:00 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 11:00:09 +0000 (13:00 +0200)
* commit '2192ff84dd720968108bc1ca54e239f4c94eb61d':
  configure: Default to armasm for --toolchain=msvc when targeting arm

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
1  2 
configure patch | diff1 | diff2 | blob | history

diff --cc configure
Simple merge
Unnamed repository; edit this file 'description' to name the repository.