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	* 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
xbindkeys	Adding xbindkeys (now with all the files)	2011-03-21 18:10:20 +00:00
xdg-utils
xdotool	Adding xdotool	2011-04-19 20:51:40 +00:00
xlaunch
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