Eelco Dolstra 99b88cfb53 Merge remote-tracking branch 'origin/master' into multiple-outputs ... Conflicts: pkgs/development/libraries/acl/default.nix pkgs/development/libraries/atk/2.6.x.nix pkgs/development/libraries/attr/default.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/glib/2.34.x.nix pkgs/development/libraries/gtk+/2.24.x.nix pkgs/development/libraries/libtiff/default.nix pkgs/development/libraries/openssl/default.nix pkgs/development/libraries/pango/1.30.x.nix pkgs/misc/cups/default.nix pkgs/os-specific/linux/util-linux/default.nix pkgs/servers/x11/xorg/builder.sh pkgs/servers/x11/xorg/default.nix pkgs/top-level/all-packages.nix		2013-06-09 00:41:27 +02:00
..
cert-file-path-max.patch	OpenSSL: Fix compilation on GNU/Hurd.	2012-01-05 23:46:17 +00:00
cert-file.patch	* OpenSSL: Allow the location of the X509 certificate file (the CA	2011-09-12 16:57:34 +00:00
darwin-arch.patch	openssl: Fix building on Darwin	2012-12-18 18:03:26 +01:00
default.nix	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-06-09 00:41:27 +02:00
gnu.patch	OpenSSL: Further fix `Configure' for GNU builds.	2012-01-06 14:07:02 +00:00
hurd-target.patch	openssl: Fix target settings when building for GNU/hurd	2011-11-16 19:03:52 +00:00
kfreebsd-gnu.patch	openssl: fix GNU/kFreeBSD builds	2012-08-13 14:12:54 +02:00