6b1ebeccf2
There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix, which I resolved to the best of my knowledge. I'd appreciate if some of the ruby gurus could have a look at the outcome of my merge, though. |
||
---|---|---|
.. | ||
arch | ||
bazaar | ||
codeville | ||
cvs | ||
cvs2svn | ||
cvsps | ||
darcs | ||
fossil | ||
git-and-tools | ||
gource | ||
guitone | ||
kdesvn | ||
meld | ||
mercurial | ||
monotone | ||
monotone-viz | ||
mr | ||
rapidsvn | ||
rcs | ||
subversion | ||
tailor | ||
tkcvs | ||
veracity | ||
viewmtn |