Yury G. Kudryashov 84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby ... svn path=/nixpkgs/branches/stdenv-updates/; revision=31721		2012-01-19 21:31:51 +00:00
..
unichrome
builder.sh	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
default.nix	intel X driver: upgraded to fix display glitches on newer chips	2012-01-18 20:38:30 +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	* Update the imake patch.	2010-07-19 10:18:06 +00:00
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	* composedArgsAndFun -> makeOverridable for consistency.	2010-07-29 08:21:21 +00:00
tarballs-7.6.list	intel X driver: upgraded to fix display glitches on newer chips	2012-01-18 20:38:30 +00:00
xorgserver-dri-path.patch
xorgserver-xkbcomp-path.patch
xorgserver.sh