mirror of
https://github.com/overte-org/overte.git
synced 2025-08-06 18:50:00 +02:00
Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-1
This commit is contained in:
commit
10907d9fb9
1 changed files with 1 additions and 0 deletions
|
@ -282,6 +282,7 @@ Window {
|
||||||
verticalCenter: backgroundImage.verticalCenter;
|
verticalCenter: backgroundImage.verticalCenter;
|
||||||
horizontalCenter: scroll.horizontalCenter;
|
horizontalCenter: scroll.horizontalCenter;
|
||||||
}
|
}
|
||||||
|
z: 100
|
||||||
}
|
}
|
||||||
|
|
||||||
HifiControls.Keyboard {
|
HifiControls.Keyboard {
|
||||||
|
|
Loading…
Reference in a new issue