vladest 34fe517c67 Merge conflicts		2017-11-18 18:48:33 +01:00
..
controller
controls	Implement QQC1-compatible Action component	2017-11-16 19:04:35 +01:00
controls-uit	Port web glyph button to QQC2	2017-11-16 21:58:09 +01:00
desktop
dialogs	Port Edit.qml to QQC2 as well as some tablet preferences compinents	2017-11-17 20:46:21 +01:00
hifi	Merge conflicts	2017-11-18 18:48:33 +01:00
js
LoginDialog
styles
styles-uit
windows
AvatarInputs.qml
Browser.qml
ConnectionFailureDialog.qml
ForceLoad.qml
InfoView.qml
LoginDialog.qml
QmlWebWindow.qml
QmlWindow.qml
Stats.qml
StatText.qml
TabletBrowser.qml
Tooltip.qml
ToolWindow.qml
UpdateDialog.qml
Web3DOverlay.qml