acd4299e75
Conflicts: pkgs/applications/networking/browsers/chromium/default.nix pkgs/top-level/all-packages.nix Merge conflicts seemed trivial, but a look from viric and aszlig would be nice. |
||
---|---|---|
.. | ||
analysis | ||
boomerang | ||
build-managers | ||
casperjs | ||
cdecl | ||
documentation | ||
guile | ||
haskell | ||
java | ||
literate-programming/noweb | ||
misc | ||
neoload | ||
ocaml | ||
parsing | ||
phantomjs | ||
profiling | ||
pydb | ||
selenium/remote-control |