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
..
applications	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00
build-support	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00
data	hicolor_icon_theme: 0.14 -> 0.15	2016-05-03 04:31:20 +02:00
desktops	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00
development	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00
games	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00
misc	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00
os-specific	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00
servers	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00
shells	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00
stdenv	Merge commit 'refs/pull/14907/head' of git://github.com/NixOS/nixpkgs into staging	2016-04-25 18:02:47 +03:00
test	Remove cruft	2016-04-26 17:31:54 +02:00
tools	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00
top-level	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00