Lluís Batlle i Rossell a38202bc8b Updating xz to a stable version. Not beta anymore. (more stdenv rebuild) ... svn path=/nixpkgs/branches/stdenv-updates/; revision=24483		2010-10-26 08:33:18 +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	Updating the patch for ocaml on mips.	2010-10-25 21:13:05 +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
stdenv
test
tools	Updating xz to a stable version. Not beta anymore. (more stdenv rebuild)	2010-10-26 08:33:18 +00:00
top-level	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00