Peter Simons 1abdc56a12 Synchronized stdenv-updates branch with trunk. ... 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		2011-10-06 09:37:22 +00:00
..
coding-conventions.xml	* Package naming / versioning guidelines.	2009-11-18 15:05:09 +00:00
introduction.xml
language-support.xml
Makefile
manual.xml
meta.xml
outline.txt
package-notes.xml	* Updated gtk+, glib, pango.	2010-01-13 12:11:06 +00:00
quick-start.xml	Doc: Fix location of thunderbird (2.x -> 3.x) expression.	2011-08-27 15:29:18 +00:00
quote-literals.xsl
release-notes.xml	Fix typo in release-notes	2011-10-02 09:24:23 +00:00
stdenv.xml	Merge from trunk up through r28790	2011-08-24 19:16:43 +00:00
style.css