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 |
||
---|---|---|
.. | ||
autopanosiftc | ||
batik | ||
cinepaint | ||
comical | ||
dia | ||
djview | ||
exrdisplay | ||
f-spot | ||
fbida | ||
feh | ||
freepv | ||
geeqie | ||
gimp | ||
gocr | ||
gqview | ||
gwenview | ||
hugin | ||
ImageMagick | ||
inkscape | ||
kuickshow | ||
meshlab | ||
panotools | ||
paraview | ||
pqiv | ||
PythonMagick | ||
qtpfsgui | ||
ufraw | ||
xaos | ||
xara | ||
xfig | ||
xournal | ||
xscreensaver |