howard-stearns 2761688d39 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll		2018-06-07 16:14:57 -07:00
..
+android
controller
controls
controls-uit	fix some bugs that had been introduced by various out-of-team prs.	2018-06-04 13:00:08 -07:00
desktop	Fixed modality in Desktop	2018-05-17 16:11:28 +02:00
dialogs	apply fixes to other file dialogs and fix tablet dialog buttons	2018-06-04 15:56:10 -07:00
hifi	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-07 16:14:57 -07:00
js
LoginDialog
styles
styles-uit
windows
AudioScopeUI.qml
AvatarInputsBar.qml
Browser.qml
ConnectionFailureDialog.qml
CurrentAPI.qml
ForceLoad.qml
InfoView.qml
LoginDialog.qml
OverlayWindowTest.qml
QmlWebWindow.qml
QmlWindow.qml
Stats.qml	Add ideal resource texture memory stat	2018-05-18 09:23:53 -07:00
StatText.qml
TabletBrowser.qml
Tooltip.qml
UpdateDialog.qml
Web3DOverlay.qml