David Kelly cd55728490 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/4036		2017-04-10 10:09:27 -07:00
..
controller
controls	Merge pull request #10160 from vladest/tabletwebview-yahoo-fix	2017-04-08 20:25:18 -07:00
controls-uit	cr feedback, plus changed 'People' to 'Connections' in a couple places	2017-04-03 17:03:14 -07:00
desktop
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/4036	2017-04-10 10:09:27 -07:00
js
LoginDialog
styles
styles-uit	pal selection changes	2017-04-06 12:07:51 -07:00
TabletLoginDialog	Implemented login facility for tablet UI	2017-03-18 14:38:49 +01:00
windows	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
AddressBarDialog.qml
AssetServer.qml	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
AvatarInputs.qml
Browser.qml	apply profile to relevant entities	2017-04-04 11:54:21 -07:00
ConnectionFailureDialog.qml
ForceLoad.qml
InfoView.qml
LoginDialog.qml
QmlWebWindow.qml
QmlWindow.qml
Stats.qml	change implict conversions	2017-04-07 17:47:04 +01:00
StatText.qml
TabletBrowser.qml	Yahoo, Reddit etc now works correctly	2017-04-07 15:45:33 +02:00
Tooltip.qml
ToolWindow.qml
UpdateDialog.qml
Web3DOverlay.qml