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
..
apps	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
core	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
devtools	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
extensions	treewide: name -> pname	2019-08-17 10:54:38 +00:00
games	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
misc	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
default.nix	gnome-photos: move from gnome3	2019-08-23 02:59:33 +02:00
find-latest-version.py	gnome3.updateScript: improve pre-release detection	2018-11-30 21:35:29 +01:00
installer.nix	gnome3: only maintain single GNOME 3 package set (#29397)	2017-09-24 12:15:50 +01:00
update.nix	gnome3.updateScript: clean up PATH	2019-06-02 09:44:13 +02:00