John Ericson 8e891e6ed4 Merge remote-tracking branch 'upstream/master' into staging

2018-05-14 10:57:33 -04:00

..

applications

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

2018-05-14 10:57:33 -04:00

build-support

…

common-updater

…

data

Merge master into staging

2018-05-13 12:13:25 +02:00

desktops

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

2018-05-14 10:57:33 -04:00

development

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

2018-05-14 10:57:33 -04:00

games

Merge pull request #39192 from r-ryantm/auto-update/rocksndiamonds

2018-05-12 11:55:04 -05:00

misc

Merge master into staging

2018-05-13 12:13:25 +02:00

os-specific

Merge master into staging

2018-05-13 12:13:25 +02:00

servers

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

2018-05-14 10:57:33 -04:00

shells

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

2018-05-14 10:57:33 -04:00

stdenv

Revert "darwin.libSystem: multiple outputs"

2018-05-13 10:01:52 +02:00

test

tests: move to attribute set

2018-05-10 23:58:12 -05:00

tools

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

2018-05-14 10:57:33 -04:00

top-level

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

2018-05-14 10:57:33 -04:00