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

2018-05-11 14:36:08 -04:00

..

applications

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

2018-05-11 14:36:08 -04:00

build-support

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

2018-05-08 09:36:00 -05:00

common-updater

…

data

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

2018-05-11 14:36:08 -04:00

desktops

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

2018-05-11 14:36:08 -04:00

development

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

2018-05-11 14:36:08 -04:00

games

wesnoth: 1.14.0 -> 1.14.1

2018-05-11 09:31:02 +03:00

misc

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

2018-05-11 14:36:08 -04:00

os-specific

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

2018-05-11 14:36:08 -04:00

servers

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

2018-05-11 14:36:08 -04:00

shells

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

2018-05-08 09:36:00 -05:00

stdenv

Merge master into staging

2018-05-09 10:48:01 +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-11 14:36:08 -04:00

top-level

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

2018-05-11 14:36:08 -04:00