]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae68bb7 5c83b4d)
Merge commit '5c83b4d550ea42653fece092987bab56ccc32ead'
authorClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 08:32:52 +0000 (10:32 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 08:32:52 +0000 (10:32 +0200)
* commit '5c83b4d550ea42653fece092987bab56ccc32ead':
  fate: Unset the sig variable if ignoring a test failure

Merged-by: Clément Bœsch <cboesch@gopro.com>
1  2 
tests/fate-run.sh patch | diff1 | diff2 | blob | history

diff --cc tests/fate-run.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.