Zach Fox af5a68b282 Merge branch 'master' of github.com:highfidelity/hifi into commerce_fixCertificateInfoError		2018-04-06 10:58:32 -07:00
..
+android	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-26 11:19:42 -03:00
audio	stereo checkbox text change	2018-03-09 10:11:25 -08:00
commerce	Merge branch 'master' of github.com:highfidelity/hifi into commerce_fixCertificateInfoError	2018-04-06 10:58:32 -07:00
dialogs	fix TabletAssetServer	2018-03-30 00:09:28 +03:00
models
overlays	Fix "text" overlay not clipping to right and bottom margins	2018-03-15 17:31:02 +13:00
tablet	support deleted scenario	2018-03-28 18:12:30 -07:00
toolbars
AssetServer.qml	FB12870 - Tablet UI ->Asset Browser unresponsive when enabling/disabling "use baked version"	2018-03-29 23:01:59 +03:00
Card.qml
ComboDialog.qml	Fix font loading for MacOS via different font loading method	2018-03-08 11:19:49 -08:00
Desktop.qml	Remove old ToolWindow code	2018-01-13 10:27:43 +13:00
DesktopLetterboxMessage.qml	Fix font loading for MacOS via different font loading method	2018-03-08 11:19:49 -08:00
Feed.qml	Fix GoTo app in HMD mode	2018-01-23 15:50:32 -07:00
LetterboxMessage.qml	Fix font loading for MacOS via different font loading method	2018-03-08 11:19:49 -08:00
NameCard.qml	Fix font loading for MacOS via different font loading method	2018-03-08 11:19:49 -08:00
Pal.qml	Fix font loading for MacOS via different font loading method	2018-03-08 11:19:49 -08:00
SkyboxChanger.qml
SpectatorCamera.qml
TabletTextButton.qml
TextButton.qml
WebBrowser.qml