Lluís Batlle i Rossell 0e4c970d11 Updating from trunk - I hope I fixed the conflict around gettext - I left it as ... it was before merging. svn path=/nixpkgs/branches/stdenv-updates/; revision=24876		2010-11-26 14:40:39 +00:00
..
applications	Updating from trunk - I hope I fixed the conflict around gettext - I left it as	2010-11-26 14:40:39 +00:00
build-support	Updating from trunk again	2010-11-17 17:03:09 +00:00
data	Do not inherit missing version attribute	2010-11-24 13:53:11 +00:00
desktops	Updating from trunk - I hope I fixed the conflict around gettext - I left it as	2010-11-26 14:40:39 +00:00
development	Updating from trunk - I hope I fixed the conflict around gettext - I left it as	2010-11-26 14:40:39 +00:00
games	Updating from trunk again	2010-11-17 17:03:09 +00:00
lib	Updating from trunk - I hope I fixed the conflict around gettext - I left it as	2010-11-26 14:40:39 +00:00
misc	Updating busybox	2010-11-25 09:05:04 +00:00
os-specific	Updating from trunk - I hope I fixed the conflict around gettext - I left it as	2010-11-26 14:40:39 +00:00
servers	Updating from trunk again	2010-11-17 17:03:09 +00:00
shells	Making bash and kbd cross-build	2010-11-25 09:14:56 +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	Making ts and tm crossbuild	2010-11-26 14:12:10 +00:00
top-level	Updating from trunk - I hope I fixed the conflict around gettext - I left it as	2010-11-26 14:40:39 +00:00