git.99rst.org
/
openwrt-packages.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4eff6c5
9693bd4
)
Merge pull request #19693 from turris-cz/ffmpeg-conflicts-provides
author
Josef Schlehofer
<redacted>
Fri, 28 Oct 2022 11:47:33 +0000
(13:47 +0200)
committer
GitHub
<redacted>
Fri, 28 Oct 2022 11:47:33 +0000
(13:47 +0200)
ffmpeg: add conflicts and provides
Trivial merge
git clone https://git.99rst.org/PROJECT
git.99rst.org / openwrt-packages.git / commitdiff