Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk ... Conflicts: cups, all-packages.nix (gcc45_debug) svn path=/nixpkgs/branches/stdenv-updates/; revision=31863		2012-01-26 15:27:03 +00:00
..
unichrome
builder.sh	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
default.nix	dri-proto: upgraded to version 2.6 so that we can use intel 2.17 driver	2012-01-21 18:47:40 +00:00
extra.list	moved parts of extra.list back to tarballs-7.6.list	2011-12-31 15:37:51 +00:00
generate-expr-from-tarballs.pl	moved parts of extra.list back to tarballs-7.6.list	2011-12-31 15:37:51 +00:00
imake.patch
imake.sh	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
libpciaccess-apple.patch	Get libpciaccess to compile on darwin	2011-08-29 18:58:59 +00:00
old.list	* X.org 7.6.	2011-02-08 17:39:28 +00:00
overrides.nix	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
replacements.nix
tarballs-7.6.list	dri-proto: upgraded to version 2.6 so that we can use intel 2.17 driver	2012-01-21 18:47:40 +00:00
xorgserver-dri-path.patch
xorgserver-xkbcomp-path.patch
xorgserver.sh