Vladimír Čunát 985d1ac425 Merge branch 'master' into staging-next ... There were several more conflicts from name -> pname+version; all auto-solved by kdiff3, hopefully OK. Hydra nixpkgs: ?compare=1538611		2019-08-25 14:57:11 +02:00
..
bsd	treewide: remove unused variables (#63177)	2019-06-16 19:59:05 +00:00
darwin	Merge staging-next into staging	2019-08-17 09:39:23 +02:00
linux	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
windows	treewide: name -> pname	2019-08-17 10:54:38 +00:00