Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging ...

Conflicts:
	pkgs/stdenv/generic/default.nix

2014-11-06 10:16:39 +01:00

..

applications

Merge remote-tracking branch 'origin/master' into staging

2014-11-06 10:16:39 +01:00

build-support

findTarball: Handle pipefail

2014-11-05 18:24:16 +01:00

data

Revert "Update Liberation fonts"

2014-11-06 10:03:42 +01:00

desktops

Merge recent master into staging

2014-11-05 15:00:44 +01:00

development

Merge remote-tracking branch 'origin/master' into staging

2014-11-06 10:16:39 +01:00

games

Merge remote-tracking branch 'origin/master' into staging

2014-11-06 10:16:39 +01:00

misc

Turn more licenses into lib.licenses style

2014-11-06 00:48:16 +00:00

os-specific

Merge remote-tracking branch 'origin/master' into staging

2014-11-06 10:16:39 +01:00

servers

Merge remote-tracking branch 'origin/master' into staging

2014-11-06 10:16:39 +01:00

shells

Merge remote-tracking branch 'origin/master' into staging

2014-10-16 15:16:50 +02:00

stdenv

Merge remote-tracking branch 'origin/master' into staging

2014-11-06 10:16:39 +01:00

test

…

tools

Merge remote-tracking branch 'origin/master' into staging

2014-11-06 10:16:39 +01:00

top-level

Merge remote-tracking branch 'origin/master' into staging

2014-11-06 10:16:39 +01:00