druiz17 68780f56b7 Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module		2017-10-02 14:06:26 -07:00
..
controller
controls	Follow naming convention	2017-09-12 19:17:49 +02:00
controls-uit	Commerce: Tons of Interface changes (#11463)	2017-09-27 14:43:51 -07:00
desktop	saving work	2017-09-29 16:48:25 -07:00
dialogs	[Case 6107] Fixes Tablet import sorting (details below).	2017-09-14 14:49:49 -04:00
hifi	Merge pull request #11471 from Atlante45/feat/auto-bake	2017-10-02 11:29:36 -07:00
js
LoginDialog
styles
styles-uit	Commerce: Tons of Interface changes (#11463)	2017-09-27 14:43: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
AvatarInputs.qml	fix typo	2017-06-20 12:20:49 -07:00
Browser.qml	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
ConnectionFailureDialog.qml
ForceLoad.qml
InfoView.qml
LoginDialog.qml
QmlWebWindow.qml	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
QmlWindow.qml	Complete console.trace and added a testcases for all 13 functions.	2017-06-13 23:52:48 +05:30
Stats.qml	track traversal time, rename entity server stat	2017-09-29 11:34:35 -07:00
StatText.qml
TabletBrowser.qml	Remove commented out code	2017-09-05 22:19:38 +02:00
Tooltip.qml
ToolWindow.qml	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
UpdateDialog.qml
Web3DOverlay.qml	a couple logging fixes	2017-08-14 17:34:32 -07:00