Zach Fox 877fa52034 Merge branch 'master' of github.com:highfidelity/hifi into improveFontLoading		2018-03-01 10:14:23 -08:00
..
+android	Include config.h in ResourceImageItem.cpp. Minor fixes	2018-01-03 16:40:14 -03:00
controller
controls	Improve font loading by using QRC instead of relative paths	2018-02-28 17:59:37 -08:00
controls-uit	Improve font loading by using QRC instead of relative paths	2018-02-28 17:59:37 -08:00
desktop
dialogs	Improve font loading by using QRC instead of relative paths	2018-02-28 17:59:37 -08:00
hifi	Merge branch 'master' of github.com:highfidelity/hifi into improveFontLoading	2018-03-01 10:14:23 -08:00
js	remove cached file	2018-02-13 11:07:15 -08:00
LoginDialog
styles	Cleanup of QML windowing and message boxes	2016-01-15 23:14:49 -08:00
styles-uit	Improve font loading by using QRC instead of relative paths	2018-02-28 17:59:37 -08:00
windows	FB11508 - toolbar slowly sides downward	2018-02-16 20:22:16 +03:00
AudioScope.qml	rename exposed to QML "Audio" context object to "AudioScriptingInteface" to avoid naming conflict	2017-12-21 20:03:38 +00:00
AvatarInputs.qml
Browser.qml
ConnectionFailureDialog.qml
CurrentAPI.qml	Improve font loading by using QRC instead of relative paths	2018-02-28 17:59:37 -08:00
ForceLoad.qml
InfoView.qml	Support toolbar API	2016-06-17 13:06:42 -07:00
LoginDialog.qml
OverlayWindowTest.qml
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
Tooltip.qml
UpdateDialog.qml
Web3DOverlay.qml	a couple logging fixes	2017-08-14 17:34:32 -07:00