forked from mirrors/nixpkgs
1abdc56a12
There were conflicting patches of pkgs/os-specific/linux/module-init-tools. Apparently, the expression was updated independently in both branches. I've resolved the conflict by preferring the patches from stdenv-updates, because those patches appeared to be more sophisticated, i.e. they build the manual, etc. svn path=/nixpkgs/branches/stdenv-updates/; revision=29680 |
||
---|---|---|
.. | ||
coding-conventions.xml | ||
introduction.xml | ||
language-support.xml | ||
Makefile | ||
manual.xml | ||
meta.xml | ||
outline.txt | ||
package-notes.xml | ||
quick-start.xml | ||
quote-literals.xsl | ||
release-notes.xml | ||
stdenv.xml | ||
style.css |