Merge branch 'crossOverlays-for-18.09' (early part) into tempory branch

Browse source

This was an early "pre-release" to stable, with a warning that the
interface is not stable yet (thought we don't actually expect it to
change).

We do expect to make many static build fixes, however, which should go
to master and staging, so we merge the cherry-picks back into master so
we can do those fixes against:

  git merge-base upstream/master upstream/release-18.09

and merge into both master and release-18.09. This is easier than
cherry-picking when one knows in advance they are targeting multiple
branches.

No files should be changed with this merge.

...

This commit is contained in:

John Ericson 2018-12-13 17:32:38 -05:00

parent ceee97c038 3170d617ef

commit 18e5cfff04

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available