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
..
dico
dict	* Removed selectVersion. There's no good reason to write	2009-11-18 09:39:59 +00:00
dns/bind	* Removed selectVersion. There's no good reason to write	2009-11-18 09:39:59 +00:00
fingerd/bsd-fingerd
ftp/vsftpd
gpm	* Fix the GPM URL.	2009-11-18 12:47:58 +00:00
gpsd
http
irc/ircd-hybrid
mail
monitoring
openafs-client
portmap
pulseaudio
sabnzbd
samba
sql
squid
x11/xorg	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00
xinetd
xmpp	Upgraded ejabberd to the latest stable 2.1.0 and also claimed maintainership since I really need this for one of my experiments	2009-11-17 16:54:04 +00:00