Clément Brisset 2a7a71db13 Merge pull request #12477 from Atlante45/new-master ... Merge stable back into master		2018-02-26 17:18:24 -08:00
..
+android
audio
commerce	Merge pull request #12477 from Atlante45/new-master	2018-02-26 17:18:24 -08:00
dialogs	Merge pull request #12449 from misslivirose/fix/atp-collisions	2018-02-26 11:15:01 -08:00
models
overlays
tablet	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork	2018-02-22 13:45:00 -08:00
toolbars
AssetServer.qml	change default add to world shape for asset browser	2018-02-20 17:55:30 -08:00
Card.qml
ComboDialog.qml
Desktop.qml
DesktopLetterboxMessage.qml
Feed.qml
LetterboxMessage.qml
NameCard.qml
Pal.qml	More intellectual calculation of title positions taking in account actual sort indicator glyph size	2018-02-24 09:32:08 +01:00
SkyboxChanger.qml
SpectatorCamera.qml
TabletTextButton.qml
TextButton.qml
WebBrowser.qml