Files
nixpkgs/pkgs/tools/X11
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
..
2010-12-27 18:30:52 +00:00
2012-12-11 15:10:55 +01:00
2011-04-19 20:51:40 +00:00
2013-02-05 17:21:51 +04:00
2011-08-23 17:52:05 +00:00
2012-04-09 20:52:00 +00:00
2010-11-25 09:38:28 +00:00