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
..
xf86videodummy
default.nix	xpra: 2.5 -> 2.5.3	2019-08-24 14:15:17 +01:00
fix-paths.patch	xpra: 2.5 -> 2.5.3	2019-08-24 14:15:17 +01:00
libfakeXinerama.nix	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00