nixpkgs/pkgs/tools/X11
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
..
bumblebee Added 'bumblebee', a package that facilitates NVidia Optimus graphics with X11. 2012-02-05 00:51:35 +00:00
keynav
vdpauinfo
virtualgl Added 'bumblebee', a package that facilitates NVidia Optimus graphics with X11. 2012-02-05 00:51:35 +00:00
x2vnc
x2x
x11vnc
xauth
xbindkeys
xdg-utils
xdotool
xlaunch
xmacro
xnee
xpra
xtrace