Zach Fox 235b27a198 Merge branch 'master' of github.com:highfidelity/hifi into payOut1		2018-12-05 16:35:07 -08:00
..
+android
audio
avatarapp	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-12 12:55:20 -08:00
commerce	Secret to Coupon ID	2018-12-05 16:34:53 -08:00
dialogs	security settings post-oculus-store wording	2018-11-15 15:59:52 -08:00
models
overlays
tablet	Head and Hand offsets for Vive Trackers now function as expected	2018-12-02 16:18:36 -08:00
toolbars
tts
AssetServer.qml	CR round 1	2018-11-08 10:05:57 -08:00
AvatarApp.qml	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-12 12:55:20 -08:00
Card.qml	Merge pull request #14395 from ctrlaltdavid/M19859	2018-11-15 09:56:56 -08:00
ComboDialog.qml
Desktop.qml	revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.	2018-11-14 12:29:09 -08:00
DesktopLetterboxMessage.qml
Feed.qml	Fix Goto app clicks not working	2018-11-14 15:27:18 +13:00
LetterboxMessage.qml
NameCard.qml
Pal.qml	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-08 09:57:10 -08:00
RootHttpRequest.qml	CR round 1	2018-11-08 10:05:57 -08:00
SkyboxChanger.qml
SpectatorCamera.qml	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-08 09:57:10 -08:00
TabletTextButton.qml
TextButton.qml
WebBrowser.qml