Vladimír Čunát 5979d428b4 Merge recent master into x-updates ... Hydra: ?compare=1134869 Conflicts (just meta): pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix		2014-07-09 22:13:29 +02:00
..
cinnamon	desktops/cinnamon/*.nix: mark as broken per https://github.com/NixOS/nixpkgs/issues/2384	2014-04-28 23:20:37 +02:00
e17	e17.terminology: 0.4.0 -> 0.5.1	2014-06-15 09:26:01 +04:00
enlightenment
gnome-2	vte: store patch in repo, source offline	2014-06-30 16:10:50 +02:00
gnome-3	empathy: fix icons	2014-07-06 11:31:09 +02:00
kde-4.12	ark: wrap for zipinfo	2014-05-25 15:25:34 -05:00
kde-4.13	kde: Make kde4_next desktop compile	2014-06-22 19:35:31 +02:00
xfce	xfce4-appfinder: update 4.9.4 -> 4.10.1	2014-06-17 09:02:38 +02:00