John Conklin II 250aa3ab43 Merge pull request #13027 from jherico/fix/web_crash2 ... Some fixes for QML surfaces		2018-05-01 12:39:46 -07:00
..
+android
controller
controls	Restore the stop functionality for a browser view when it's being destroyed	2018-04-27 17:35:38 -07:00
controls-uit	Fixed saving after editing	2018-04-21 20:18:24 +02:00
desktop	Merge pull request #12888 from SamGondelman/statsAssert	2018-04-13 16:35:28 -07:00
dialogs	Changed maximum line count for warning message	2018-04-27 14:34:08 -07:00
hifi	Merge pull request #13039 from zfox23/sideloadAppJson	2018-04-30 11:14:24 -07:00
js
LoginDialog
styles
styles-uit	Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018	2018-04-16 10:11:44 -07:00
windows	Merge pull request #12723 from ctrlaltdavid/21801	2018-04-16 11:12:26 -07:00
AudioScopeUI.qml
AvatarInputsBar.qml
Browser.qml
ConnectionFailureDialog.qml
CurrentAPI.qml
ForceLoad.qml
InfoView.qml
LoginDialog.qml
OverlayWindowTest.qml
QmlWebWindow.qml
QmlWindow.qml
Stats.qml
StatText.qml
TabletBrowser.qml
Tooltip.qml
UpdateDialog.qml
Web3DOverlay.qml