Martin Weinelt 372f32f009 Merge pull request #101983 from cheriimoya/libass ... [staging] libass 0.14.0 -> 0.15.0		2020-11-05 19:55:54 +01:00
..
applications	Merge pull request #102635 from r-ryantm/auto-update/ocenaudio	2020-11-05 10:42:00 -08:00
build-support	Merge pull request #101403 from mickours	2020-11-05 00:17:36 +01:00
common-updater
data	Merge branch 'master' into staging-next	2020-11-05 09:42:47 +01:00
desktops	Merge branch 'master' into staging-next	2020-11-05 09:42:47 +01:00
development	libass: 0.14.0 -> 0.15.0	2020-11-05 19:03:04 +01:00
games	openxray: 730-july-preview -> 784-october-preview	2020-11-04 11:32:01 +01:00
misc	Merge staging-next into staging	2020-11-04 09:28:07 +01:00
os-specific	Merge branch 'master' into staging-next	2020-11-05 09:42:47 +01:00
pkgs-lib
servers	Merge branch 'master' into staging-next	2020-11-05 09:42:47 +01:00
shells	Merge staging-next into staging	2020-11-04 09:28:07 +01:00
stdenv
test
tools	Merge branch 'master' into staging-next	2020-11-05 09:42:47 +01:00
top-level	Merge branch 'master' into staging-next	2020-11-05 09:42:47 +01:00