Jörg Thalheim 41581d1222 Merge pull request #43874 from plumelo/feature/avocode-3.2.0 ... avocode: 3.1.1 -> 3.2.0		2018-07-21 16:02:51 +01:00
..
applications	Merge pull request #43874 from plumelo/feature/avocode-3.2.0	2018-07-21 16:02:51 +01:00
build-support	Merge branch 'master' into unused5	2018-07-21 15:41:22 +01:00
common-updater
data	Merge branch 'master' into unused5	2018-07-21 15:41:22 +01:00
desktops	Merge branch 'master' into unused5	2018-07-21 15:41:22 +01:00
development	Merge pull request #43869 from volth/unused5	2018-07-21 15:57:57 +01:00
games	Merge branch 'master' into unused5	2018-07-21 15:41:22 +01:00
misc	Merge branch 'master' into unused5	2018-07-21 15:41:22 +01:00
os-specific	Merge branch 'master' into unused5	2018-07-21 15:41:22 +01:00
servers	Merge branch 'master' into unused5	2018-07-21 15:41:22 +01:00
shells	pkgs/*: remove unreferenced function arguments	2018-07-21 02:48:04 +00:00
stdenv	[bot] treewide: remove unused 'inherit' in let blocks	2018-07-20 19:38:19 +00:00
test	Merge remote-tracking branch 'upstream/master' into staging	2018-06-18 15:30:39 -04:00
tools	Merge pull request #43869 from volth/unused5	2018-07-21 15:57:57 +01:00
top-level	Merge branch 'master' into unused5	2018-07-21 15:41:22 +01:00