nixpkgs/pkgs/misc
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
..
cups cups: Don't build on Darwin 2013-01-29 12:43:53 +01:00
drivers hplip: make pyqt4 dependency conditional on qtSupport 2013-02-08 00:27:07 +01:00
emulators Wine: update to 1.5.25 2013-03-07 00:28:59 +04:00
foldingathome
freestyle
ghostscript ghostscript: fix infinite recursion in meta (sorry for that) 2013-01-31 13:21:21 +01:00
gxemul
jackaudio jackaudio/default.nix: Update to 1.9.9.5. 2013-02-03 20:22:43 +04:00
lilypond
maven
my-env Merge branch 'master' into stdenv-updates. 2013-02-25 01:26:26 +01:00
screensavers
source-and-tags Remove unnecessary parentheses around if conditions 2012-12-28 19:54:15 +01:00
themes/gtk2/oxygen-gtk oxygen-gtk: upgrade gtk2 version to 1.3.2.1 2013-02-24 02:30:53 +01:00
uboot Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
xosd
misc.nix