Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-1

This commit is contained in:
Seth Alves 2016-10-18 16:02:34 -07:00
commit 10907d9fb9

View file

@ -282,6 +282,7 @@ Window {
verticalCenter: backgroundImage.verticalCenter;
horizontalCenter: scroll.horizontalCenter;
}
z: 100
}
HifiControls.Keyboard {