Sam Gondelman c59d29f4ee Merge pull request #12623 from SamGondelman/android ... Android: Fix corruption on startup		2018-03-12 15:03:07 -07:00
..
+android	cleanup, don't compress rcc file to fix corruption	2018-03-12 13:05:03 -07:00
controller
controls	Fix font loading for MacOS via different font loading method	2018-03-08 11:19:49 -08:00
controls-uit	Merge pull request #12553 from vladest/mac_combobox_misplaced	2018-03-12 14:47:39 -07:00
desktop	Fix focus hack. Add QML debug info	2018-02-21 20:10:03 -03:00
dialogs	Fix font loading for MacOS via different font loading method	2018-03-08 11:19:49 -08:00
hifi	Merge remote-tracking branch 'upstream/master' into android	2018-03-12 14:15:31 -07:00
js	remove cached file	2018-02-13 11:07:15 -08:00
LoginDialog	Remove Forgot labels in login dialog	2018-02-20 12:59:06 -03:00
styles
styles-uit	Fix font loading for MacOS via different font loading method	2018-03-08 11:19:49 -08:00
windows	Merge branch 'android' into android_bubble_fix	2018-03-06 18:58:49 -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	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 11:19:49 -08:00
ForceLoad.qml
InfoView.qml
LoginDialog.qml
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
Tooltip.qml
UpdateDialog.qml
Web3DOverlay.qml