Dante Ruiz e46d9da98f fixed merge conflict		2017-04-18 00:22:35 +01:00
..
controller
controls	removed comments and non-needed files	2017-04-14 18:06:44 +01: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	fixed merge conflict	2017-04-11 16:58:25 +01:00
hifi	fixed merge conflict	2017-04-18 00:22:35 +01: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	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