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
..
2018-01-20 15:47:59 -05:00
2018-02-06 23:38:46 +01:00
2017-12-29 14:41:15 -05:00