Vladimír Čunát 1278859d31 Merge branch 'master' into x-updates ... Conflicts (just splitting version from name): pkgs/os-specific/linux/systemd/default.nix		2013-05-08 13:46:46 +02:00
..
audio
display-managers
editors	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
graphics
misc	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
networking	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
office	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
science	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
search
taxes
version-management	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
video	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
virtualization
window-managers