nixpkgs/pkgs/servers/x11/xorg
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
..
unichrome
builder.sh
default.nix Version bumb of 'xf86-synaptics' module, which fixes a cpu-stealing bug when using syndaemon. 2012-02-05 00:43:54 +00:00
extra.list
generate-expr-from-tarballs.pl
imake.patch
imake.sh
libpciaccess-apple.patch
old.list
overrides.nix
replacements.nix
tarballs-7.6.list Version bumb of 'xf86-synaptics' module, which fixes a cpu-stealing bug when using syndaemon. 2012-02-05 00:43:54 +00:00
xorgserver-dri-path.patch
xorgserver-xkbcomp-path.patch
xorgserver.sh