Brad Davis ca6e86e767 Merge remote-tracking branch 'upstream/master' into vive-ui ... Conflicts: interface/resources/qml/hifi/dialogs/RunningScripts.qml		2016-06-07 21:51:47 -07:00
..
controller
controls
controls-uit	Pinned UI support	2016-06-02 17:24:25 -07:00
desktop	Make QML overlays disappear, use fade for non-window types	2016-06-02 19:15:19 -07:00
dialogs	Pinned UI support	2016-06-02 17:24:25 -07:00
hifi	Merge remote-tracking branch 'upstream/master' into vive-ui	2016-06-07 21:51:47 -07:00
js
menus
styles
styles-uit	Fix up file browser resize handle and outlining	2016-05-25 13:10:26 +12:00
windows	Make QML overlays disappear, use fade for non-window types	2016-06-02 19:15:19 -07:00
AddressBarDialog.qml	Pinned UI support	2016-06-02 17:24:25 -07:00
AssetServer.qml	Pinned UI support	2016-06-02 17:24:25 -07:00
AvatarInputs.qml
Browser.qml	Fix browser and update dialogs	2016-06-02 19:54:25 -07:00
ForceLoad.qml
InfoView.qml	Pinned UI support	2016-06-02 17:24:25 -07:00
LoginDialog.qml	Pinned UI support	2016-06-02 17:24:25 -07:00
QmlWebWindow.qml	Pinned UI support	2016-06-02 17:24:25 -07:00
QmlWindow.qml	Pinned UI support	2016-06-02 17:24:25 -07:00
Stats.qml
Tooltip.qml
ToolWindow.qml	Pinned UI support	2016-06-02 17:24:25 -07:00
UpdateDialog.qml	Fix browser and update dialogs	2016-06-02 19:54:25 -07:00
WebEntity.qml