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-02-11 14:55:17 -06:00
2017-09-16 21:36:43 -04:00
2018-01-31 14:02:19 -05:00
2017-09-16 21:36:43 -04:00
2017-09-16 21:36:43 -04:00
2018-02-12 21:01:48 +01:00
2017-09-16 21:36:43 -04:00
2017-08-22 13:28:55 +03:00
2018-01-31 14:02:19 -05:00
2017-12-02 13:28:00 -05:00
2018-02-08 10:01:49 +01:00