Tuomas Tynkkynen 6a11ebfae9 Merge remote-tracking branch 'upstream/master' into gcc-7 ... Conflicts: pkgs/development/compilers/gcc/7/default.nix pkgs/development/libraries/SDL2/default.nix pkgs/top-level/all-packages.nix		2018-01-26 16:46:43 +02:00
..
applications	thunderbird: 52.5.2 -> 52.6.0	2018-01-26 09:13:04 +09:00
build-support	Carnix 0.6 (#34238)	2018-01-26 10:53:18 +00:00
common-updater
data	hackage: update all-cabal-hashes snapshot to Hackage at 2018-01-18T14:32:45Z	2018-01-18 17:01:33 +01:00
desktops	gnome-shell-extension-pixel-saver: init at 1.10	2018-01-23 21:17:19 -05:00
development	Merge remote-tracking branch 'upstream/master' into gcc-7	2018-01-26 16:46:43 +02:00
games	linux-steam-integration: Append "Settings" to settings launcher menu item (#34020)	2018-01-24 13:26:48 -05:00
misc	Merge remote-tracking branch 'upstream/master' into gcc-7	2018-01-26 16:46:43 +02:00
os-specific	Merge remote-tracking branch 'upstream/master' into gcc-7	2018-01-26 16:46:43 +02:00
servers	prometheus-alertmanager: 0.9.1 -> 0.13.0	2018-01-25 17:41:25 -05:00
shells	Remove nckx as a maintainer for all packages	2018-01-16 23:00:49 +01:00
stdenv	Merge remote-tracking branch 'upstream/master' into gcc-7	2018-01-26 16:46:43 +02:00
test	sierra-shared-test: fix build	2018-01-05 23:20:55 +01:00
tools	Merge remote-tracking branch 'upstream/master' into gcc-7	2018-01-26 16:46:43 +02:00
top-level	Merge remote-tracking branch 'upstream/master' into gcc-7	2018-01-26 16:46:43 +02:00