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
..
2012-01-18 20:16:00 +00:00
2012-02-28 23:01:25 +00:00
2013-02-05 15:23:09 +01:00
2013-01-27 20:43:38 -05:00
2012-07-06 03:12:08 +02:00
2012-11-12 23:51:45 +04:00
2009-07-09 22:30:19 +00:00
2012-01-18 20:16:00 +00:00
2012-12-28 19:20:09 +01:00
2013-01-28 17:19:01 +01:00
2011-10-17 12:59:44 +00:00
2012-01-18 20:16:00 +00:00
2012-01-19 21:31:51 +00:00
2007-08-24 12:32:36 +00:00
2012-04-12 07:12:07 +00:00
2013-02-21 14:28:58 +01:00
2011-07-10 14:04:09 +00:00
2012-12-25 11:25:56 +01:00
2012-01-18 20:16:00 +00:00
2013-02-24 09:22:50 +01:00
2012-11-23 17:29:06 +01:00
2013-02-22 09:33:06 +01:00
2012-01-18 20:16:00 +00:00
2012-01-18 20:16:00 +00:00
2013-02-17 11:01:20 +01:00
2012-07-18 09:50:36 -04:00
2013-03-09 17:55:37 +01:00
2010-11-29 11:13:03 +00:00
2013-02-24 10:59:54 +01:00
2011-09-02 08:05:51 +00:00
2013-03-04 10:43:20 -05:00
2009-11-07 11:17:53 +00:00
2012-11-29 13:43:37 +01:00
2012-09-09 07:00:01 +02:00