Nissim Hadar b519ebd6f1 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork		2018-02-21 12:36:56 -08:00
..
+android	Include config.h in ResourceImageItem.cpp. Minor fixes	2018-01-03 16:40:14 -03:00
controller
controls	Fix social media sharing buttons on Snapshot app	2018-01-12 14:58:14 -08:00
controls-uit	Merge pull request #12291 from 1P-Cusack/FogBugz/Case_10865	2018-02-14 11:14:26 -08:00
desktop
dialogs	Merge pull request #12138 from Triplelexx/21669_prompt_keyboard	2018-01-31 11:19:49 -08:00
hifi	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork	2018-02-21 12:36:56 -08:00
js	remove cached file	2018-02-13 11:07:15 -08:00
LoginDialog	8992 Login window is small in tablet	2017-12-14 23:53:33 +00:00
styles
styles-uit	add focused color	2018-01-18 19:56:55 +00: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	Updated UI to fit Toolkit Standards	2018-01-19 14:52:44 -08:00
ForceLoad.qml
InfoView.qml
LoginDialog.qml
OverlayWindowTest.qml
QmlWebWindow.qml
QmlWindow.qml
Stats.qml
StatText.qml
TabletBrowser.qml
Tooltip.qml
UpdateDialog.qml
Web3DOverlay.qml