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
..
applications	Synchronized stdenv-updates branch with trunk.	2011-10-06 09:37:22 +00:00
build-support	Synchronized stdenv-updates branch with trunk.	2011-10-06 09:37:22 +00:00
data	Get Theme-GNU directly from spock while kernel.org is down	2011-09-28 22:34:46 +00:00
desktops	kde3: use meta.platforms	2011-10-02 21:15:36 +00:00
development	Synchronized stdenv-updates branch with trunk.	2011-10-06 09:37:22 +00:00
games	Update liquidWar	2011-10-04 08:54:01 +00:00
lib	Merge from trunk	2011-09-23 16:58:45 +00:00
misc	Synchronized stdenv-updates branch with trunk.	2011-10-06 09:37:22 +00:00
os-specific	Synchronized stdenv-updates branch with trunk.	2011-10-06 09:37:22 +00:00
servers	virtuoso: apply patch as proposed by Nepomuk developers	2011-09-27 15:40:45 +00:00
shells	synchronize with trunk	2011-09-28 14:48:34 +00:00
stdenv	Making gcc 4.6 that of stdenv.	2011-09-01 14:28:13 +00:00
test
tools	GNU grep 2.9.	2011-10-02 20:36:06 +00:00
top-level	Synchronized stdenv-updates branch with trunk.	2011-10-06 09:37:22 +00:00