Tuomas Tynkkynen aadaa91379 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/applications/networking/browsers/vivaldi/default.nix pkgs/misc/emulators/wine/base.nix		2016-05-03 23:12:48 +03:00
..
altcoins	boost: Kill unnecessary 'lib' output	2016-04-28 00:41:28 +03:00
audio	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00
backup	Merge pull request #14977 from jerith666/crashplan-46-r3	2016-04-25 20:38:42 +03:00
display-managers	lightdm: 1.16.5 -> 1.18.1 (#14834)	2016-04-19 23:06:27 +01:00
editors	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00
gis	grass: fix build	2016-04-13 16:20:31 +00:00
graphics	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00
inferno
misc	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00
networking	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00
office	boost: Kill unnecessary 'lib' output	2016-04-28 00:41:28 +03:00
science	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00
search	add get* helper functions and mass-replace manual outputs search with them	2016-04-25 13:24:39 +03:00
taxes
version-management	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00
video	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00
virtualization	rkt: 1.2.0 -> 1.4.0	2016-04-23 20:57:19 +02:00
window-managers	matchbox: update source urls + libmatchbox: 1.9 -> 1.11 (#15160)	2016-05-02 12:26:32 +02:00