Tuomas Tynkkynen 6b6a575748 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/tools/networking/telnet/default.nix pkgs/top-level/aliases.nix		2018-05-16 03:09:33 +03:00
..
apps	Merge master into staging	2018-05-09 10:48:01 +02:00
core	Merge remote-tracking branch 'upstream/master' into staging	2018-05-16 03:09:33 +03:00
devtools	gnome3: 3.28.0 → 3.28.1	2018-04-14 13:35:45 +02:00
extensions	gnomeExtensions.dash-to-dock: 62 → 63	2018-04-03 18:13:25 +02:00
games	gnome3: 3.28.0 → 3.28.1	2018-04-14 13:35:45 +02:00
misc	geary: 0.12.1 → 0.12.2	2018-04-24 13:30:57 +02:00
default.nix	rarian: merge gnome{2,3}.rarian	2018-04-25 15:53:26 +02:00
find-latest-version.py	gnome3.updateScript: ignore prerelease versions	2018-03-04 20:05:53 +01:00
installer.nix	gnome3: only maintain single GNOME 3 package set (#29397)	2017-09-24 12:15:50 +01:00
update.nix	gnome3: add updateScript	2018-03-01 02:53:00 +01:00