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
..
altcoins	Merge remote-tracking branch 'upstream/master' into staging	2018-05-10 13:29:04 -04:00
audio	Merge commit '92b7a814f26ee1d37e989431c18518c67285a332' into staging	2018-05-13 01:02:09 -04:00
backup	treewide: remove placeholder usage	2018-03-27 20:14:44 +02:00
display-managers	treewide: move "extensions" drvs to dir	2018-04-17 13:50:49 -05:00
editors	Merge pull request #40562 from dtzWill/update/nano-2.9.7	2018-05-15 14:06:55 -05:00
gis	grass: compile with libLAS	2018-04-17 09:29:02 +01:00
graphics	Merge remote-tracking branch 'upstream/master' into staging	2018-05-14 10:57:33 -04:00
inferno
kde	kde-applications: 18.04.0 -> 18.04.1	2018-05-14 17:48:47 +08:00
misc	Merge remote-tracking branch 'upstream/master' into staging	2018-05-16 03:09:33 +03:00
networking	Merge remote-tracking branch 'upstream/master' into staging	2018-05-16 03:09:33 +03:00
office	skrooge: 2.12.0 -> 2.13.0	2018-05-12 14:01:07 +02:00
science	pspp: provide default icons & settings	2018-05-15 15:42:13 -05:00
search	grepcidr: init at 2.0 (#38685)	2018-04-20 15:40:28 +02:00
version-management	Merge remote-tracking branch 'upstream/master' into staging	2018-05-11 14:36:08 -04:00
video	Merge remote-tracking branch 'upstream/master' into staging	2018-05-16 03:09:33 +03:00
virtualization	Merge remote-tracking branch 'upstream/master' into staging	2018-05-14 10:57:33 -04:00
window-managers	i3status: 2.11 -> 2.12	2018-05-11 12:08:13 +02:00