Jonathan Ringer 46fd0afcb3 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/development/python-modules/pysdl2/default.nix pkgs/top-level/aliases.nix		2022-02-06 18:36:59 -08:00
..
atomicparsley
bento4
dvgrab
gopro
harvid
mjpegtools
play-with-mpv
rav1e
replay-sorcery
rtmpdump
svt-av1
swfmill
swftools
untrunc-anthwlock
vcsi
vnc2flv
vncrec
xjadeo
yamdi