David Kelly 331f2da4f8 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3936		2017-04-06 14:22:08 -07:00
..
controller
controls	TabletWebView redesigned to single WebView instance	2017-04-06 17:53:46 +02:00
controls-uit	cr feedback, plus changed 'People' to 'Connections' in a couple places	2017-04-03 17:03:14 -07:00
desktop	Make tablet popups work like they should	2017-03-16 10:38:46 -07:00
dialogs	Intial commit. Basically works. Need some testing	2017-03-29 17:36:05 +02:00
hifi	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3936	2017-04-06 14:22:08 -07:00
js
LoginDialog
styles
styles-uit	pal selection changes	2017-04-06 12:07:51 -07:00
TabletLoginDialog	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
windows	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
AddressBarDialog.qml	fix some fallout from toolbar changes	2017-01-25 16:29:36 -08:00
AssetServer.qml	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
AvatarInputs.qml	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
Browser.qml	fixed webview mobile view	2017-04-01 00:58:09 +01:00
ConnectionFailureDialog.qml
ForceLoad.qml
InfoView.qml
LoginDialog.qml
QmlWebWindow.qml	Handle Clara marketplace downloads	2016-12-20 07:40:28 -08:00
QmlWindow.qml
Stats.qml	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
StatText.qml
TabletBrowser.qml	TabletWebView redesigned to single WebView instance	2017-04-06 17:53:46 +02:00
Tooltip.qml
ToolWindow.qml
UpdateDialog.qml
Web3DOverlay.qml	Handle Clara marketplace downloads	2016-12-20 07:40:28 -08:00