Brad Davis cbb2d9d854 Merge remote-tracking branch 'upstream/master' into android		2018-01-17 17:51:39 -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 branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-11 12:35:18 -08:00
desktop
dialogs	Fix 'Browse Avatars' button from Avatar Settings	2018-01-12 15:14:42 -08:00
hifi	Merge remote-tracking branch 'upstream/master' into android	2018-01-17 17:51:39 -08:00
js	add .jsc, remove duplicate qmlc, and remote Utils.jsc	2018-01-02 17:15:23 -08:00
LoginDialog	8992 Login window is small in tablet	2017-12-14 23:53:33 +00:00
styles
styles-uit
windows
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	Added filter for QT autogenerated functions and integrated it to Developers menu	2017-12-21 16:26:06 -07: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