nixpkgs/pkgs/applications
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
..
audio applications/audio/caps: New nixpkg. 2013-03-09 17:54:59 +04:00
display-managers/slim consolekit: Remove 2012-12-13 11:30:18 +01:00
editors Re-generate all Haskell packages with the latest version of cabal2nix. 2013-02-25 00:32:40 +01:00
graphics 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
networking Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
office Merge branch 'master' into x-updates 2013-03-09 17:55:37 +01:00
science Merge branch 'master' into x-updates 2013-03-09 17:55:37 +01:00
taxes * It's that time of year again. 2012-03-10 19:23:04 +00:00
version-management Merge branch 'master' into x-updates 2013-03-09 17:55:37 +01:00
video Merge branch 'makemkv.130223.0' of git://github.com/jcumming/nixpkgs 2013-03-08 17:26:53 -05:00
virtualization Merge branch 'master' into stdenv-updates 2013-03-02 10:41:53 +01:00
window-managers Merge branch 'master' into stdenv-updates 2013-03-02 10:41:53 +01:00