Jonathan Ringer 03f8de4775 unpaper: pin ffmpeg to 4.x		2022-02-07 11:26:55 -08:00
..
applications	qcad: fix src	2022-02-07 11:24:46 -08:00
build-support	Merge master into staging-next	2022-02-05 12:01:13 +00:00
common-updater
data	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-06 18:36:59 -08:00
desktops	libsForQt5.bismuth: 2.2.0 -> 2.3.0	2022-02-06 17:05:54 -08:00
development	python3Packages.jupyterhub: disable ssl test	2022-02-07 11:01:12 -08:00
games	alephone: pin ffmpeg to 4.x	2022-02-07 10:29:32 -08:00
misc	gnash: remove	2022-02-07 10:04:52 -08:00
os-specific	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-06 18:36:59 -08:00
pkgs-lib
servers	Merge master into staging-next	2022-02-07 12:01:12 +00:00
shells	oh-my-zsh: 2021-12-18 -> 2022-01-18	2022-01-31 10:01:00 -08:00
stdenv	Merge branch 'staging-next' into staging	2022-02-01 21:37:39 -05:00
test	tests: Add test for makeWrapper	2022-02-02 20:08:26 +01:00
tools	unpaper: pin ffmpeg to 4.x	2022-02-07 11:26:55 -08:00
top-level	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-07 11:15:10 -08:00