Lluís Batlle i Rossell b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts. ... svn path=/nixpkgs/branches/stdenv-updates/; revision=25188		2010-12-17 20:39:58 +00:00
..
applications	Merging from trunk. I solved some trivial merge conflicts.	2010-12-17 20:39:58 +00:00
build-support	Fix about the order of -rpath and -L in the ld-wrapper	2010-12-14 15:22:25 +00:00
data	Some improvements to intl-rich layout	2010-12-17 12:19:34 +00:00
desktops	Merging from trunk. I solved some trivial merge conflicts.	2010-12-17 20:39:58 +00:00
development	Merging from trunk. I solved some trivial merge conflicts.	2010-12-17 20:39:58 +00:00
games	Merging from trunk. I solved some trivial merge conflicts.	2010-12-17 20:39:58 +00:00
lib	Updating from trunk. I resolved simple conflicts.	2010-12-11 12:47:00 +00:00
misc	Merging from trunk. I solved some trivial merge conflicts.	2010-12-17 20:39:58 +00:00
os-specific	Merging from trunk. I solved some trivial merge conflicts.	2010-12-17 20:39:58 +00:00
servers	Merging from trunk. I solved some trivial merge conflicts.	2010-12-17 20:39:58 +00:00
shells	Updating from trunk. I resolved simple conflicts.	2010-12-11 12:47:00 +00:00
stdenv	Making the addCoverageInformation stdenv adapter better in the sense that it	2010-11-30 14:10:52 +00:00
test
tools	Merging from trunk. I solved some trivial merge conflicts.	2010-12-17 20:39:58 +00:00
top-level	Merging from trunk. I solved some trivial merge conflicts.	2010-12-17 20:39:58 +00:00