Brad Hefta-Gaub 16df773de4 Merge pull request #12721 from highfidelity/RC66 ... RC66 - Mergeback		2018-03-28 09:55:46 -07:00
..
+android	Merge pull request #12661 from SamGondelman/android	2018-03-23 11:08:50 -07:00
controller
controls	Fix font loading for MacOS via different font loading method	2018-03-08 14:31:48 -08:00
controls-uit	Merge pull request #12552 from vladest/assetbrowser_cosmetics	2018-03-22 17:56:47 -07:00
desktop	Fix focus hack. Add QML debug info	2018-02-21 20:10:03 -03:00
dialogs	don't free dialogs to avoid crash in setKeyboardRaised	2018-03-27 09:28:55 -07:00
hifi	Merge pull request #12637 from druiz17/fix-asset-server-qml	2018-03-28 09:35:53 -07:00
js	remove cached file	2018-02-13 11:07:15 -08:00
LoginDialog	Android - Joystick hidden when opening login and shown after Cancel.	2018-03-09 17:41:05 -03:00
styles
styles-uit	Remove reference to non existing id	2018-03-10 16:35:17 +01:00
windows	Add the url of each qml as on-screen debug info	2018-03-07 17:18:37 -03:00
AudioScope.qml
AvatarInputsBar.qml	FB12956 - Audio Meter Toggle Button Broken	2018-03-09 02:20:34 +03:00
Browser.qml
ConnectionFailureDialog.qml
CurrentAPI.qml	Fix font loading for MacOS via different font loading method	2018-03-08 14:31:48 -08:00
ForceLoad.qml
InfoView.qml
LoginDialog.qml
OverlayWindowTest.qml
QmlWebWindow.qml
QmlWindow.qml
Stats.qml	Add more timing stats in explanded mode	2018-02-28 10:48:35 -08:00
StatText.qml
TabletBrowser.qml
Tooltip.qml
UpdateDialog.qml
Web3DOverlay.qml