77da5efc78
Conflicts: pkgs/development/libraries/glibc/2.19/builder.sh (previous merge taken) pkgs/development/tools/misc/patchelf/default.nix (easy) pkgs/stdenv/generic/setup.sh (previous merge taken) |
||
---|---|---|
.. | ||
csslint | ||
nodejs | ||
remarkjs | ||
twitter-bootstrap | ||
xmlindent |