Roxanne Skelly c33d2aafda Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags		2019-03-08 11:41:34 -08:00
..
+android_interface	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-07 09:49:27 -08:00
+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	destroy modal dialogs that prevent interface from getting input	2019-03-07 14:29:38 -08:00
hifi	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-03-08 11:41:34 -08:00
js
LoginDialog
styles
styles-uit	adding clock	2019-02-25 18:00:56 -08:00
stylesUit	adding clock	2019-02-25 18:00:56 -08:00
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	remove overlay picks from stats qml	2019-02-07 14:25:07 -08:00
StatText.qml
TabletBrowser.qml
Tooltip.qml
UpdateDialog.qml
Web3DSurface.qml	Resolving more master differences	2019-02-14 12:55:28 -08:00