Vladimír Čunát b5fba47147 Merge branch master into x-updates ... Conflicts (not used, deleted): pkgs/desktops/xfce/common.nix		2013-11-23 10:22:26 +01:00
..
applications
art
core	xfce4-session: Don't set $PATH in xflock4 script	2013-11-19 15:38:57 +01:00
panel-plugins
default.nix