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
..
arch	* Get rid of many instances of "args: with args;", and other coding	2010-07-28 11:55:54 +00:00
bazaar	bazaar: Update to 2.5.1	2013-01-15 18:53:12 +01:00
codeville	* Removed selectVersion. There's no good reason to write	2009-11-18 09:39:59 +00:00
cvs	pkgs/applications/version-management/cvs: fixed location of "info" and "man" directories	2010-11-05 14:35:22 +00:00
cvs2svn	* makeWrapper: option --run <CMD> to run a command from the wrapper.	2008-01-18 11:28:41 +00:00
cvsps	* Cleaned up a lot of description fields that contained newlines.	2009-03-03 13:27:40 +00:00
darcs	darcs: disable test suite to avoid 127 exit code	2013-02-25 00:37:11 +01:00
fossil	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
git-and-tools	haskell-github-backup: update to version 1.20120314	2013-03-02 17:07:43 +01:00
gource	gource: cosmetic, no functional change	2012-01-16 11:33:57 +00:00
guitone	Update Guitone	2010-11-02 19:19:25 +00:00
kdesvn	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
meld	* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.	2012-01-18 20:53:01 +00:00
mercurial	python module cleanup, enable a couple of tests, add comments for failing	2012-12-03 06:38:11 +01:00
monotone	monotone: fix	2013-02-24 00:31:20 +01:00
monotone-viz	Remove a bunch of unreferenced files	2012-11-29 13:43:37 +01:00
mr	mr-1.13, more verbose install	2012-08-31 12:07:22 +04:00
rapidsvn	Adding rapidsvn	2010-03-10 20:44:40 +00:00
rcs	rcs: Update to 5.8.1 and fix build	2013-01-28 17:19:02 +01:00
subversion	subversion: Update to 1.7.8	2013-01-14 14:38:23 +01:00
tailor	Fix tailor URL	2012-04-12 20:54:39 +00:00
tkcvs	Updating tkcvs (which includes tkdiff)	2010-03-15 14:26:47 +00:00
veracity	Update veracity	2012-12-04 10:12:38 +04:00
viewmtn	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00