Vladimír Čunát 2d6179d1e8 Merge branch 'master' into staging ...

A few trivial conflicts due to *Platforms mass replace.

2018-09-01 17:38:18 +02:00

..

applications

Merge branch 'master' into staging

2018-09-01 17:38:18 +02:00

build-support

lib: ensure directories of linkFarm links exist (#45628)

2018-09-01 14:53:23 +02:00

common-updater

…

data

Merge #45731: artwork update (replacing old logo)

2018-09-01 10:43:20 +02:00

desktops

Merge branch 'master' into staging

2018-09-01 17:38:18 +02:00

development

Merge branch 'master' into staging

2018-09-01 17:38:18 +02:00

games

Merge pull request #45855 from pstn/steam-python3

2018-09-01 10:51:20 +02:00

misc

treewide: Remove usage of remaining redundant platform compatability stuff

2018-08-30 17:20:32 -04:00

os-specific

Merge branch 'master' into staging

2018-09-01 17:38:18 +02:00

servers

dico: 2.5 -> 2.6 (#45837)

2018-09-01 14:08:38 +02:00

shells

treewide: Remove usage of remaining redundant platform compatability stuff

2018-08-30 17:20:32 -04:00

stdenv

Merge branch 'master' into staging

2018-09-01 17:38:18 +02:00

test

…

tools

Merge branch 'master' into staging

2018-09-01 17:38:18 +02:00

top-level

Merge branch 'master' into staging

2018-09-01 17:38:18 +02:00