Michael Raskin 31b22ed108 Merge from trunk ... svn path=/nixpkgs/branches/stdenv-updates/; revision=24820		2010-11-23 08:57:29 +00:00
..
applications	Merge from trunk	2010-11-23 08:57:29 +00:00
build-support	Updating from trunk again	2010-11-17 17:03:09 +00:00
data	Do not use ttmkfdir - claimed to be obsolete, Debian patches are going offline..	2010-11-10 13:22:53 +00:00
desktops	Updating from trunk.	2010-11-11 22:18:14 +00:00
development	Merge from trunk	2010-11-23 08:57:29 +00:00
games	Updating from trunk again	2010-11-17 17:03:09 +00:00
lib	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
misc	Merging from trunk	2010-11-22 11:39:42 +00:00
os-specific	Merge from trunk	2010-11-23 08:57:29 +00:00
servers	Updating from trunk again	2010-11-17 17:03:09 +00:00
shells	GNU Rush 1.7.	2010-08-19 16:55:51 +00:00
stdenv	Fixing a stdenv problem... 'binutils' where linked with zlib from	2010-11-21 14:29:20 +00:00
test	Add a new way to handle option sets.	2008-08-05 17:16:35 +00:00
tools	Fix the makefile	2010-11-22 23:16:05 +00:00
top-level	Merge from trunk	2010-11-23 08:57:29 +00:00