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 |
||
---|---|---|
.. | ||
browsers | ||
cluster/rq | ||
instant-messengers | ||
iptraf | ||
irc | ||
kphone | ||
mailreaders | ||
msmtp | ||
newsreaders/pan | ||
p2p | ||
remote | ||
skype | ||
sniffers | ||
sync | ||
twinkle | ||
vnstat | ||
yafc |