Tuomas Tynkkynen 1a06373c0a Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/development/libraries/libclc/default.nix pkgs/top-level/all-packages.nix		2018-02-13 16:42:55 +02:00
..
default.nix	Merge remote-tracking branch 'upstream/master' into staging	2018-02-13 16:42:55 +02:00