Yury G. Kudryashov 08761e83fc Merge trunk ...

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

2012-01-02 14:12:40 +00:00

..

applications

Merge trunk

2012-01-02 14:12:40 +00:00

build-support

Merge trunk

2012-01-02 14:12:40 +00:00

data

…

desktops

Revert "Use qt-4.8 by default"

2012-01-02 12:54:22 +00:00

development

Merge trunk

2012-01-02 14:12:40 +00:00

games

…

lib

…

misc

Merge trunk

2012-01-02 14:12:40 +00:00

os-specific

Merge trunk

2012-01-02 14:12:40 +00:00

servers

moved parts of extra.list back to tarballs-7.6.list

2011-12-31 15:37:51 +00:00

shells

Merge trunk

2012-01-02 14:12:40 +00:00

stdenv

…

test

…

tools

Merge trunk

2012-01-02 14:12:40 +00:00

top-level

Merge trunk

2012-01-02 14:12:40 +00:00