3
0
Fork 0
forked from mirrors/nixpkgs
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 * Improved a bunch of "name" attributes (mostly missing version 2009-10-28 14:06:56 +00:00
vdpauinfo * Added libvdpau and vdpauinfo. 2010-12-27 18:30:52 +00:00
virtualgl Added 'bumblebee', a package that facilitates NVidia Optimus graphics with X11. 2012-02-05 00:51:35 +00:00
x2vnc * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
x2x * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
x11vnc * Hard-code the path to xdpyinfo rather than expecting it to be in 2011-11-11 03:11:09 +00:00
xauth * Get rid of all references to nix.cs.uu.nl. 2008-11-14 16:57:19 +00:00
xbindkeys Adding xbindkeys (now with all the files) 2011-03-21 18:10:20 +00:00
xdg-utils * Added xdg-utils, a package that contains desktop integration 2010-03-25 19:48:06 +00:00
xdotool Adding xdotool 2011-04-19 20:51:40 +00:00
xlaunch * More cleanup. 2010-07-28 15:35:01 +00:00
xmacro Fix xmacro build 2011-08-23 17:52:05 +00:00
xnee GNU xnee 3.11. 2012-01-18 20:52:50 +00:00
xpra * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
xtrace xtrace 1.0.2. 2010-11-25 09:38:28 +00:00