diff options
author | James Almer <jamrial@gmail.com> | 2017-10-28 15:08:31 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-28 15:08:31 -0300 |
commit | 16a17fb6b2592caea6f0e7b79d09fd7d1f33177d (patch) | |
tree | 0996aef37bec484148efca882db389a5464fea3f /.gitattributes | |
parent | 7d829da3f91984240bae05325f1f7538d31f605b (diff) | |
parent | 4809781586d1c956005f72946a2aab5915eab350 (diff) | |
download | ffmpeg-16a17fb6b2592caea6f0e7b79d09fd7d1f33177d.tar.gz |
Merge commit '4809781586d1c956005f72946a2aab5915eab350'
* commit '4809781586d1c956005f72946a2aab5915eab350':
travis: Exclude gcc for the macOS target
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions