David Rowe 8ae3d4e8a0 Merge branch 'master' into 21314 ... # Conflicts: # interface/resources/qml/controls/TabletWebView.qml		2017-05-04 13:10:09 +12:00
..
controller
controls	Merge branch 'master' into 21314	2017-05-04 13:10:09 +12:00
controls-uit
desktop
dialogs	Merge branch 'master' into 21249	2017-04-20 08:43:00 +12:00
hifi	Make the change	2017-05-03 14:57:31 -07:00
js
LoginDialog
styles
styles-uit
TabletLoginDialog
windows
AddressBarDialog.qml
AssetServer.qml
AvatarInputs.qml
Browser.qml
ConnectionFailureDialog.qml
ForceLoad.qml
InfoView.qml
LoginDialog.qml
QmlWebWindow.qml
QmlWindow.qml
Stats.qml	Add pending to stats	2017-04-25 15:56:23 -07:00
StatText.qml
TabletBrowser.qml
Tooltip.qml
ToolWindow.qml
UpdateDialog.qml
Web3DOverlay.qml