Lluís Batlle i Rossell 6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well. ... svn path=/nixpkgs/branches/stdenv-updates/; revision=24429		2010-10-23 14:52:21 +00:00
..
applications	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
build-support	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
data	Switch to kde-4.5 by default	2010-10-10 07:39:01 +00:00
desktops	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
development	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
games	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +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. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
os-specific	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
servers	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
shells	GNU Rush 1.7.	2010-08-19 16:55:51 +00:00
stdenv	Setting any stdenv.system references for the loongson2f system to 'mips64-linux'.	2010-09-01 09:50:12 +00:00
test
tools	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00
top-level	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00