John Conklin II 53a5261905 Merge pull request #12712 from zfox23/newUpdateCertLocation ... Fix cert location for content sets; handle .content.zip content sets		2018-04-03 09:10:11 -07:00
..
+android	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-26 11:19:42 -03: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 branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation	2018-03-30 10:10:43 -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
AudioScopeUI.qml	minimize diff	2018-03-29 11:24:31 -07:00
AvatarInputsBar.qml	FB12956 - Audio Meter Toggle Button Broken	2018-03-09 02:20:34 +03:00
Browser.qml	Merge pull request #11706 from luiscuenca/webAudioDev_fresh	2017-11-21 11:29:48 -08:00
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	Test Tablet keyboard specific	2017-10-02 20:02:55 +02:00
OverlayWindowTest.qml	Whitelist functionality for tablet apps	2017-11-04 15:14:06 -07:00
QmlWebWindow.qml
QmlWindow.qml	Whitelist functionality for tablet apps	2017-11-04 15:14:06 -07:00
Stats.qml	Add more timing stats in explanded mode	2018-02-28 10:48:35 -08:00
StatText.qml
TabletBrowser.qml	Remove commented out code	2017-09-05 22:19:38 +02:00
Tooltip.qml
UpdateDialog.qml
Web3DOverlay.qml	a couple logging fixes	2017-08-14 17:34:32 -07:00