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
..
default.nix	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
install-megasync.patch	reworked patches	2019-06-25 04:23:47 +02:00
noinstall-distro-version.patch	reworked patches	2019-06-25 04:23:47 +02:00