Vladimír Čunát b1eeae8cac Merge branch 'master' into x-updates ... Conflicts (easy): pkgs/desktops/xfce/core/xfdesktop.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/pango/default.nix		2013-03-17 11:28:28 +01:00
..
applications
art
core	xfce.xfdesktop: regression-fix release	2013-03-10 22:59:45 +01:00
panel-plugins
support
4_08.nix
4_10.nix
common.nix
default.nix	xfce: fix NixOS support	2013-03-09 10:51:34 +01:00