Vladimír Čunát 77da5efc78 merge the rest of multiple-outputs ...

Conflicts:
	pkgs/development/libraries/glibc/2.19/builder.sh (previous merge taken)
	pkgs/development/tools/misc/patchelf/default.nix (easy)
	pkgs/stdenv/generic/setup.sh (previous merge taken)

2014-08-25 10:41:49 +02:00

..

applications

merge the rest of multiple-outputs

2014-08-25 10:41:49 +02:00

build-support

merge the rest of multiple-outputs

2014-08-25 10:41:49 +02:00

data

man-pages: Update to 3.70

2014-08-19 11:46:08 +02:00

desktops

Merge 'staging'

2014-08-24 10:50:22 +02:00

development

merge the rest of multiple-outputs

2014-08-25 10:41:49 +02:00

games

update minecraft-server to 1.7.10

2014-08-18 18:51:51 -07:00

misc

Merge 'staging' into multiple-outputs

2014-08-23 16:04:53 +02:00

os-specific

merge the rest of multiple-outputs

2014-08-25 10:41:49 +02:00

servers

Merge 'staging'

2014-08-24 10:50:22 +02:00

shells

…

stdenv

merge the rest of multiple-outputs

2014-08-25 10:41:49 +02:00

test

…

tools

merge the rest of multiple-outputs

2014-08-25 10:41:49 +02:00

top-level

merge the rest of multiple-outputs

2014-08-25 10:41:49 +02:00