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
..
cups	cups: fix reference to dbus.libs	2013-04-11 16:02:24 +02:00
drivers
emulators	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
foldingathome
freestyle
ghostscript
gxemul
jackaudio
lilypond
maven
my-env	Add cleanupCmds option to pkgs.myEnvFun	2013-04-13 19:10:50 +02:00
screensavers
source-and-tags
themes	gnome-themes-standard: Initial expression	2013-03-25 15:23:45 +01:00
uboot
xosd
misc.nix