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
..
1.12.2.nix
default.nix	Merge branch 'master' into x-updates	2013-03-17 11:28:28 +01:00