Lluís Batlle i Rossell a3403e6828 Finishing the update from trunk, having resolved the eclipse related directory ... renaming. I think directory renaming breaks the usual merges... because it leaves the 'to be removed' directory in the working directory still. A manual 'rm' of the 'to be removed' directory fixed the commit. svn merge ^/nixpkgs/trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=18661		2009-11-26 21:46:08 +00:00
..
busybox
cups	pkgs/misc/cups/default.nix: don't install files to /etc or /usr	2009-11-05 13:33:36 +00:00
drivers/gutenprint	gutenprint: Fix name, improve style.	2009-11-22 19:11:27 +00:00
emulators
foldingathome
freestyle
ghostscript
gxemul
jackaudio
lilypond
linuxwacom	Update Linux Wacom	2009-11-07 09:25:06 +00:00
maven	update maven2	2009-11-25 07:51:06 +00:00
my-env
ntfs-3g
ntfsprogs
sane-backends
sane-front
screensavers
source-and-tags
synaptics
tex
trac
uboot	Fixing the uboot cross-build.	2009-11-19 21:43:03 +00:00
xosd
xsane
bleeding-edge-fetch-infos.nix	Remove duplicate declaration	2009-10-28 05:25:52 +00:00
misc.nix