Tuomas Tynkkynen 003473613a Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/top-level/all-packages.nix		2018-05-18 03:54:38 +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	vscode: 1.23.0 -> 1.23.1	2018-05-16 07:34:24 -04: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-18 03:54:38 +03:00
inferno	pkgs: refactor needless quoting of homepage meta attribute (#27809)	2017-08-01 22:03:30 +02:00
kde	kdenlive: Fix build by removing already upstreamed patch	2018-05-16 09:24:25 +08:00
misc	Merge remote-tracking branch 'upstream/master' into staging	2018-05-18 03:54:38 +03:00
networking	Merge remote-tracking branch 'upstream/master' into staging	2018-05-18 03:54:38 +03:00
office	skrooge: 2.12.0 -> 2.13.0	2018-05-12 14:01:07 +02:00
science	Merge pull request #40614 from symphorien/ries	2018-05-17 21:30:47 +02: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	btops: init at 0.1.0	2018-05-16 16:05:49 +09:00