nixpkgs/pkgs
Vladimír Čunát bde20f3e88 Merge branch 'master' into x-updates
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
..
applications Merge branch 'master' into x-updates 2013-04-24 06:29:09 +00:00
build-support haskell-packages.nix: fix the implementation of 'cabalNoTest' 2013-04-19 10:46:18 +02:00
data Merge branch 'master' into x-updates 2013-04-04 21:43:40 +02:00
desktops Merge branch 'master' into x-updates 2013-04-24 06:29:09 +00:00
development Merge branch 'master' into x-updates 2013-04-24 06:29:09 +00:00
games Merge branch 'master' into x-updates 2013-04-24 06:29:09 +00:00
lib poppler: share most things between glib and qt4 versions 2013-04-21 20:15:38 +00:00
misc Merge branch 'master' into x-updates 2013-04-24 06:29:09 +00:00
os-specific Merge branch 'master' into x-updates 2013-04-24 06:29:09 +00:00
servers Merge branch 'master' into x-updates 2013-04-24 06:29:09 +00:00
shells bash-completion: update to version 2.1 2013-04-10 17:39:09 +02:00
stdenv Remove the "proprietary" license 2013-04-12 14:37:50 +02:00
test Add a new way to handle option sets. 2008-08-05 17:16:35 +00:00
tools Merge branch 'master' into x-updates 2013-04-24 06:29:09 +00:00
top-level Merge branch 'master' into x-updates 2013-04-24 06:29:09 +00:00