Tuomas Tynkkynen aadaa91379 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/applications/networking/browsers/vivaldi/default.nix pkgs/misc/emulators/wine/base.nix		2016-05-03 23:12:48 +03:00
..
1.0.1-cygwin64.patch
chacha.nix	openssl-chacha: Split into multiple outputs	2016-04-14 08:32:20 +03:00
darwin-arch.patch
default.nix	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00
use-etc-ssl-certs.patch	openssl: Compile in /etc/ssl/certs/ca-certificates.crt	2016-02-03 13:45:05 +01:00