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
..
abiword	abiword: Enable parallel building.	2012-12-12 12:36:17 +01:00
antiword
basket	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
calligra	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
gnucash	gnucash: fix for new intltool	2013-02-16 15:35:14 +01:00
gnumeric	gnumeric: Update to 1.12.0	2013-02-06 01:26:24 +01:00
hledger-interest	haskell-hledger-interest: update to version 1.4.2	2012-11-26 15:32:13 +01:00
homebank
impressive	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
kbibtex	Add kbibtex	2012-06-09 13:09:45 +00:00
keepnote
kmymoney	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
koffice	koffice, kbluetooth: remove from hydra	2013-03-02 09:21:11 +01:00
ledger	ledger-2.6.3: update the location of the source code tarball some more	2013-01-28 18:05:54 +01:00
libreoffice	Rename openoffice directory to libreoffice	2013-01-29 12:43:53 +01:00
mmex	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
scribus	Scribus minor update, modifying dependencies.	2012-08-07 17:41:18 +02:00
skrooge	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
zanshin	zanshin-0.2.1, fix advertised version	2012-06-13 07:09:07 +00:00