5417c720fd
I tried to fix some trivial conflicts. I don't know if I merged well some more difficult conflicts on openssl/darwin_patch or haskell-platform. svn path=/nixpkgs/branches/stdenv-updates/; revision=22878 |
||
---|---|---|
.. | ||
bvi | ||
eclipse | ||
ed | ||
elvis | ||
emacs-22 | ||
emacs-23 | ||
emacs-modes | ||
emacs-snapshot | ||
jedit | ||
joe | ||
kile | ||
leksah | ||
monodevelop | ||
monodoc | ||
nano | ||
nedit | ||
nvi | ||
vim | ||
zile |