Lluís Batlle i Rossell a3403e6828 Finishing the update from trunk, having resolved the eclipse related directory ... renaming. I think directory renaming breaks the usual merges... because it leaves the 'to be removed' directory in the working directory still. A manual 'rm' of the 'to be removed' directory fixed the commit. svn merge ^/nixpkgs/trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=18661		2009-11-26 21:46:08 +00:00
..
unichrome	Fixing the url for the xorg video unichrome driver.	2009-11-06 19:26:00 +00:00
builder.sh	Fixing stdenv's chain of propagated-build-inputs (2nd level propagated build	2009-11-23 19:45:18 +00:00
default.nix	* Fix the font packages. They need a --with-fontrootdir flag now.	2009-10-30 08:20:03 +00:00
extra.list	* X.org 7.5.	2009-10-29 17:56:10 +00:00
generate-expr-from-tarballs.pl	* Fix the font packages. They need a --with-fontrootdir flag now.	2009-10-30 08:20:03 +00:00
imake.patch
imake.sh
old.list	* Bring back libXxf86misc and xf86miscproto. These were removed from	2009-10-29 18:25:53 +00:00
overrides.nix	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00
replacements.nix
tarballs-7.5.list	* X.org 7.5.	2009-10-29 17:56:10 +00:00
xorgserver-dri-path.patch	Updating the xorg dri path patch for dri2.	2009-11-06 21:15:59 +00:00
xorgserver-xkbcomp-path.patch
xorgserver.sh