vladest 90b891dbc3 Fix push issue due to merge errors		2018-02-27 16:42:30 +01:00
..
+android	Include config.h in ResourceImageItem.cpp. Minor fixes	2018-01-03 16:40:14 -03:00
controller
controls	Merge branch 'master' into move_to_qqc2	2018-01-16 21:08:49 +01:00
controls-uit	Merge branch 'master' into move_to_qqc2	2018-02-27 15:23:52 +01:00
desktop
dialogs	Merge branch 'master' into move_to_qqc2	2018-01-31 22:13:52 +01:00
hifi	Fix push issue due to merge errors	2018-02-27 16:42:30 +01:00
js	remove cached file	2018-02-13 11:07:15 -08:00
LoginDialog	Merge branch 'master' into move_to_qqc2	2017-12-18 20:57:04 +01:00
styles
styles-uit	Merge branch 'master' into move_to_qqc2	2018-02-24 02:59:40 +01:00
windows	Fix clipping issues in scrolling window	2018-02-27 16:27:08 +01: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	Move Slider	2017-12-28 15:39:22 +01:00
Stats.qml
StatText.qml
TabletBrowser.qml
Tooltip.qml
UpdateDialog.qml
Web3DOverlay.qml