diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-29 21:45:18 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-29 21:50:49 +0100 |
commit | a8fe8d4fe9868b11bf6417e4b9b6b3e50d637b69 (patch) | |
tree | a5e6b2cffa6fd65fef129aac095bf33265af6229 /library.mak | |
parent | 0460b9bb3e34472223084a6c3ad35b4ded9c276b (diff) | |
parent | 9510d7689e236f6a4748795604fba427c130d0ad (diff) | |
download | ffmpeg-a8fe8d4fe9868b11bf6417e4b9b6b3e50d637b69.tar.gz |
Merge commit '9510d7689e236f6a4748795604fba427c130d0ad'
* commit '9510d7689e236f6a4748795604fba427c130d0ad':
fate.sh: Allow non-fast-forwards when updating sources
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'library.mak')
0 files changed, 0 insertions, 0 deletions