Dmitry Kalinkin 74af05601c Revert "opencolorio: combine dev and out outputs of expat when building" ... This reverts commit 7d82e18159.		2021-07-03 19:30:45 -04:00
..
applications	Merge branch 'staging-next' into staging	2021-07-03 17:51:55 -04:00
build-support
common-updater
data	Merge pull request #127015 from r-ryantm/auto-update/terminus-font-ttf	2021-07-03 08:32:08 -05:00
desktops	Merge master into staging-next	2021-07-03 18:01:07 +00:00
development	Revert "opencolorio: combine dev and out outputs of expat when building"	2021-07-03 19:30:45 -04:00
games	Merge branch 'master' into staging-next	2021-07-03 17:51:15 -04:00
misc
os-specific	Merge branch 'staging-next' into staging	2021-07-03 17:51:55 -04:00
pkgs-lib
servers	Merge staging-next into staging	2021-07-03 18:01:40 +00:00
shells
stdenv
test
tools	Merge branch 'staging-next' into staging	2021-07-03 17:51:55 -04:00
top-level	Merge branch 'master' into staging-next	2021-07-03 17:51:15 -04:00