John Ericson 18742471af Merge remote-tracking branch 'upstream/master' into staging ...

Use newer vagrant from master

2018-05-23 09:40:37 -04:00

..

applications

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

2018-05-23 09:40:37 -04:00

build-support

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

2018-05-21 20:21:48 -04:00

common-updater

…

data

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

2018-05-22 17:48:29 +03:00

desktops

Merge branch 'master' into staging

2018-05-20 13:20:53 +02:00

development

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

2018-05-23 09:40:37 -04:00

games

freeciv: enable on darwin

2018-05-21 19:56:52 -05:00

misc

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

2018-05-22 17:48:29 +03:00

os-specific

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

2018-05-23 09:40:37 -04:00

servers

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

2018-05-23 09:40:37 -04:00

shells

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

2018-05-23 09:40:37 -04:00

stdenv

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

2018-05-18 03:54:38 +03:00

test

…

tools

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

2018-05-23 09:40:37 -04:00

top-level

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

2018-05-23 09:40:37 -04:00