Roxanne Skelly 8c058f147e Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags		2019-02-20 14:24:47 -08:00
..
+android_interface
+webengine	the proper fix for browser qml issues	2019-02-13 10:45:07 -08:00
androidAppForce
controller
controls
controls-uit
controlsUit	the proper fix for browser qml issues	2019-02-13 10:45:07 -08:00
desktop	Suppress logspam with missing Controller in QML	2019-02-15 14:15:24 -08:00
dialogs	Android - Make minWidth of message dialog wider so error messages like protocol version error fits in two lines	2019-02-11 21:28:31 -03:00
hifi	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-02-20 14:24:47 -08:00
js
LoginDialog
styles
styles-uit
stylesUit
windows
AnimStats.qml
AudioScopeUI.qml
AvatarInputsBar.qml
Browser.qml	the proper fix for browser qml issues	2019-02-13 10:45:07 -08:00
BrowserWebView.qml	the proper fix for browser qml issues	2019-02-13 10:45:07 -08:00
ConnectionFailureDialog.qml
CurrentAPI.qml
ForceLoad.qml
InfoView.qml	the proper fix for browser qml issues	2019-02-13 10:45:07 -08:00
InteractiveWindow.qml
LoginDialog.qml
OverlayLoginDialog.qml
OverlayWindowTest.qml
QmlWebWindow.qml	the proper fix for browser qml issues	2019-02-13 10:45:07 -08:00
QmlWebWindowView.qml	the proper fix for browser qml issues	2019-02-13 10:45:07 -08:00
QmlWindow.qml
Stats.qml
StatText.qml
TabletBrowser.qml
Tooltip.qml
UpdateDialog.qml
Web3DSurface.qml	Resolving more master differences	2019-02-14 12:55:28 -08:00