Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates ... Conflicts (simple): pkgs/applications/networking/browsers/chromium/default.nix pkgs/development/libraries/libsoup/default.nix pkgs/os-specific/linux/kernel/manual-config.nix pkgs/os-specific/linux/qemu-kvm/default.nix		2013-03-02 10:41:53 +01:00
..
bumblebee
keynav
vdpauinfo
virtualgl	virtualgl: fixing and updating to 2.3.2	2013-03-01 10:18:00 +01:00
x2vnc
x2x
x11vnc	x11vnc: Fix more hard-coded /bin/su	2013-02-16 11:29:28 -05:00
xbindkeys
xcalib	xcalib: Fix maintainer	2012-12-11 15:10:55 +01:00
xdg-utils
xdotool
xkb-switch	xkb_switch: command line tool to switch X keyboard layouts	2012-12-27 17:45:08 +04:00
xlaunch	Fixing xlaunch for systemd branch	2013-02-05 17:21:51 +04:00
xmacro
xnee
xpra	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
xtrace