a3403e6828
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 |
||
---|---|---|
.. | ||
dico | ||
dict | ||
dns/bind | ||
fingerd/bsd-fingerd | ||
ftp/vsftpd | ||
gpm | ||
gpsd | ||
http | ||
irc/ircd-hybrid | ||
monitoring | ||
openafs-client | ||
portmap | ||
pulseaudio | ||
sabnzbd | ||
samba | ||
sql | ||
squid | ||
x11/xorg | ||
xinetd | ||
xmpp |