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
..
applications	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
build-support	Adding ZPAQ archiver	2013-03-09 16:33:14 +04:00
data	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
desktops	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
development	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
games	vdrift: update and fix	2013-03-09 14:59:39 +01:00
lib	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
misc	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
os-specific	Merge branch 'p/selinux' of git://github.com/vcunat/nixpkgs	2013-03-08 18:00:16 -05:00
servers	Merge branch 'fixVmwareFix' of git://github.com/Davorak/nixpkgs	2013-03-08 18:19:02 -05:00
shells
stdenv	Enable __ignoreNulls globally	2013-03-07 19:42:01 +01:00
test
tools	netpbm: update and attempt to fix i686 build	2013-03-09 14:59:39 +01:00
top-level	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00