Eelco Dolstra 552fd3d599 Merge remote-tracking branch 'origin/master' into multiple-outputs ... Conflicts: pkgs/development/libraries/atk/default.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/gmime/default.nix pkgs/development/libraries/pango/default.nix pkgs/servers/x11/xorg/default.nix pkgs/top-level/all-packages.nix		2013-06-25 18:42:56 +02:00
..
generic	Kindly ask strip to not mess up timestamps in static libraries	2013-06-25 11:15:45 +03:00
linux	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-06-25 18:42:56 +02:00
mingw	stdenv/setup.sh: Always run postPatch hook.	2013-02-27 15:26:18 +01:00
native	Pass ‘config’ to stdenv/generic/default.nix	2013-01-17 23:24:55 +01:00
nix	Pass ‘config’ to stdenv/generic/default.nix	2013-01-17 23:24:55 +01:00
adapters.nix	More renames	2012-12-28 19:42:10 +01:00
common-path.nix	* Don't use the "replace-literal" command in stdenv; instead use	2012-01-19 13:47:26 +00:00
default.nix	Pass ‘config’ to stdenv/generic/default.nix	2013-01-17 23:24:55 +01:00