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
..
e17	e17.embryo: Fix meta.	2013-02-16 16:38:46 -05:00
enlightenment
gnome-2	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
gnome-3	gnome3: factor out doCompileSchemas	2013-02-21 21:58:09 +01:00
kde-4.7	A more complete fix of cyrus-sasl update (broken KDEs).	2013-03-13 21:06:37 +01:00
kde-4.8	kde48.okteta: disable parallel build	2013-02-28 09:54:22 +01:00
xfce	Merge branch 'master' into x-updates	2013-03-17 11:28:28 +01:00