Adam Smith f955313afc Merge pull request #14687 from SamGondelman/cancel ... Case 20580: Trying to fix wearables and avatar app		2019-01-17 11:25:30 -08:00
..
+android
audio
avatarapp	Merge pull request #14687 from SamGondelman/cancel	2019-01-17 11:25:30 -08:00
avatarPackager	- CR/style fixes	2019-01-04 23:39:04 +01:00
commerce	Merge branch 'MS20187_itemTrash' of github.com:zfox23/hifi into MS20187_itemTrash	2018-12-19 15:16:55 -08:00
dialogs	Merge branch 'master' into NOverlays3	2018-12-19 11:37:10 -08:00
models
overlays
tablet	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2019-01-04 15:29:07 +01:00
toolbars
tts
AssetServer.qml
AvatarApp.qml	Merge pull request #14556 from vladest/avatar_app_warnings	2019-01-15 11:03:43 -08:00
AvatarPackagerWindow.qml	- error messages	2019-01-03 22:00:22 +01:00
Card.qml
ComboDialog.qml
Desktop.qml	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-07 10:12:46 -08:00
DesktopLetterboxMessage.qml
Feed.qml
LetterboxMessage.qml
NameCard.qml
Pal.qml	Return more connections in pal	2018-12-11 14:47:18 -08:00
RootHttpRequest.qml
SkyboxChanger.qml
SpectatorCamera.qml
TabletTextButton.qml
TextButton.qml
WebBrowser.qml