Jeff Clinton 75d26dc45f Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption ... Add menu checkbox to toggle collisions with other avatars		2019-01-07 08:58:09 -08:00
..
+android
audio
avatarapp	Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption	2019-01-07 08:58:09 -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
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	Add menu checkbox to toggle collisions with other avatars	2019-01-04 16:38:48 -07:00
AvatarPackagerWindow.qml	- error messages	2019-01-03 22:00:22 +01:00
Card.qml
ComboDialog.qml
Desktop.qml
DesktopLetterboxMessage.qml
Feed.qml
LetterboxMessage.qml
NameCard.qml
Pal.qml
RootHttpRequest.qml
SkyboxChanger.qml
SpectatorCamera.qml
TabletTextButton.qml
TextButton.qml
WebBrowser.qml