Tuomas Tynkkynen 6b6a575748 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/tools/networking/telnet/default.nix pkgs/top-level/aliases.nix		2018-05-16 03:09:33 +03:00
..
default.nix	Merge remote-tracking branch 'upstream/master' into staging	2018-05-16 03:09:33 +03:00
riscv-no-relax.patch	gcc: Add uncommitted patch.	2018-03-16 16:39:55 -04:00
riscv-pthread-reentrant.patch	RISC-V: Add upstream gcc patch to fix -pthread.	2018-02-26 05:24:36 -05:00