Vladimír Čunát 13295e7f55 Merge #123068: mplayer: fix build failure with ffmpeg 4.4		2021-05-15 11:13:12 +02:00
..
applications	Merge #123068: mplayer: fix build failure with ffmpeg 4.4	2021-05-15 11:13:12 +02:00
build-support	Merge master into staging-next	2021-05-13 18:32:50 +00:00
common-updater
data	amber-theme: 3.36-2 -> 3.38-1	2021-05-14 01:28:57 +00:00
desktops	Merge master into staging-next	2021-05-12 12:27:04 +00:00
development	wlroots_0_12: fixup build with ffmpeg-4.4	2021-05-15 11:07:47 +02:00
games	Merge pull request #122657 from malob/0verkill-darwin-fix	2021-05-12 23:13:12 +02:00
misc	Merge branch 'master' into staging-next	2021-05-14 22:27:34 +02:00
os-specific	Merge branch 'master' into staging-next	2021-05-14 22:27:34 +02:00
pkgs-lib
servers	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-14 21:57:09 -07:00
shells	Merge branch 'master' into staging-next	2021-05-14 22:27:34 +02:00
stdenv
test
tools	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-14 21:57:09 -07:00
top-level	Revert "lua51Packages.luxio: fix build"	2021-05-15 09:37:32 +02:00