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
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
stdenv	Remove the "proprietary" license	2013-04-12 14:37:50 +02:00
test
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