Vladimír Čunát
86639d9bb9
Merge branch 'master' into x-updates
Conflicts (taken master versions):
pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
pkgs/desktops/xfce/applications/gigolo.nix
pkgs/desktops/xfce/applications/mousepad.nix
pkgs/desktops/xfce/applications/ristretto.nix
pkgs/desktops/xfce/applications/terminal.nix
pkgs/desktops/xfce/applications/xfce4-mixer.nix
pkgs/desktops/xfce/applications/xfce4-notifyd.nix
pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
pkgs/desktops/xfce/art/xfce4-icon-theme.nix
pkgs/desktops/xfce/core/exo.nix
pkgs/desktops/xfce/core/garcon.nix
pkgs/desktops/xfce/core/gtk-xfce-engine.nix
pkgs/desktops/xfce/core/libxfce4ui.nix
pkgs/desktops/xfce/core/libxfce4util.nix
pkgs/desktops/xfce/core/libxfcegui4.nix
pkgs/desktops/xfce/core/thunar-volman.nix
pkgs/desktops/xfce/core/thunar.nix
pkgs/desktops/xfce/core/tumbler.nix
pkgs/desktops/xfce/core/xfce4-appfinder.nix
pkgs/desktops/xfce/core/xfce4-panel.nix
pkgs/desktops/xfce/core/xfce4-power-manager.nix
pkgs/desktops/xfce/core/xfce4-session.nix
pkgs/desktops/xfce/core/xfce4-settings.nix
pkgs/desktops/xfce/core/xfconf.nix
pkgs/desktops/xfce/core/xfdesktop.nix
pkgs/desktops/xfce/core/xfwm4.nix
pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
pkgs/development/libraries/webkit/default.nix
pkgs/top-level/all-packages.nix
2013-03-09 17:55:37 +01:00
..
2013-03-06 16:33:01 +01:00
2010-06-03 15:19:59 +00:00
2012-12-28 19:08:19 +01:00
2012-12-28 19:54:15 +01:00
2010-02-25 13:09:08 +00:00
2012-10-05 09:11:25 -07:00
2013-02-01 00:39:26 -05:00
2013-03-08 22:59:54 +01:00
2013-02-25 06:31:19 -05:00
2012-12-28 19:54:15 +01:00
2012-12-04 12:58:23 +01:00
2012-08-13 15:15:16 -04:00
2013-02-17 15:55:47 +01:00
2012-12-04 12:58:22 +01:00
2009-07-06 16:19:52 +00:00
2010-09-13 15:31:06 +00:00
2013-03-09 17:55:37 +01:00
2012-04-15 23:41:25 +00:00
2012-11-20 13:56:14 +01:00
2013-02-04 07:20:14 -05:00
2013-02-11 15:32:24 +01:00