John Ericson 5a754e75b4 Merge branch 'ericson2314-cross-master' into staging

2018-01-16 13:05:39 -05:00

..

applications

Merge branch 'ericson2314-cross-master' into staging

2018-01-16 13:05:39 -05:00

build-support

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

2018-01-14 21:18:27 +02:00

common-updater

update-source-version: Name part of name can contain dashes

2017-12-26 20:02:01 +02:00

data

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

2018-01-14 21:18:27 +02:00

desktops

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

2018-01-14 21:18:27 +02:00

development

Merge branch 'ericson2314-cross-master' into staging

2018-01-16 13:05:39 -05:00

games

Merge pull request #33792 from paraseba/scidvspc

2018-01-13 21:16:19 -05:00

misc

Merge pull request #32822 from LumiGuide/elk6

2018-01-14 10:40:50 +01:00

os-specific

Merge branch 'ericson2314-cross-master' into staging

2018-01-16 13:05:39 -05:00

servers

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

2018-01-14 21:18:27 +02:00

shells

nix-bash-completions: 0.6.1 -> 0.6.2

2018-01-10 08:40:57 +01:00

stdenv

Merge branch 'ericson2314-cross-master' into staging

2018-01-16 13:05:39 -05:00

test

sierra-shared-test: fix build

2018-01-05 23:20:55 +01:00

tools

Merge branch 'ericson2314-cross-master' into staging

2018-01-16 13:05:39 -05:00

top-level

Merge branch 'ericson2314-cross-master' into staging

2018-01-16 13:05:39 -05:00