Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging ...

Conflicts:
	pkgs/development/libraries/poppler/default.nix

2014-10-16 15:16:50 +02:00

..

cert-file-path-max.patch

…

cert-file.patch

…

darwin-arch.patch

…

default.nix

Merge remote-tracking branch 'origin/master' into staging

2014-10-16 15:16:50 +02:00

gnu.patch

…

hurd-target.patch

…

kfreebsd-gnu.patch

…

no-date-in-library.patch

openssl: make it deterministic

2014-09-13 15:05:27 +02:00