Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts. ...

svn path=/nixpkgs/branches/stdenv-updates/; revision=25061

2010-12-11 12:47:00 +00:00

..

applications

Updating from trunk. I resolved simple conflicts.

2010-12-11 12:47:00 +00:00

build-support

Updating from trunk. I resolved simple conflicts.

2010-12-11 12:47:00 +00:00

data

Do not inherit missing version attribute

2010-11-24 13:53:11 +00:00

desktops

Updating from trunk. I resolved simple conflicts.

2010-12-11 12:47:00 +00:00

development

Updating from trunk. I resolved simple conflicts.

2010-12-11 12:47:00 +00:00

games

Updating from trunk. I resolved simple conflicts.

2010-12-11 12:47:00 +00:00

lib

Updating from trunk. I resolved simple conflicts.

2010-12-11 12:47:00 +00:00

misc

Updating from trunk. I resolved simple conflicts.

2010-12-11 12:47:00 +00:00

os-specific

Updating from trunk. I resolved simple conflicts.

2010-12-11 12:47:00 +00:00

servers

Updating from trunk. I resolved simple conflicts.

2010-12-11 12:47:00 +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

Updating from trunk. I resolved simple conflicts.

2010-12-11 12:47:00 +00:00

top-level

Updating from trunk. I resolved simple conflicts.

2010-12-11 12:47:00 +00:00