David Rowe 4dd7667fd7 Merge branch 'tablet-ui' into 21209 ... # Conflicts: # interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml # interface/src/ui/overlays/Web3DOverlay.cpp		2017-03-14 08:50:01 +13:00
..
attachments	Tablet and desktop versions of attachment model browser dialog	2017-03-11 15:38:21 +13:00
content	Tablet and desktop versions of attachment model browser dialog	2017-03-11 15:38:21 +13:00
AttachmentsDialog.qml	Remove redundant keyboard handling code	2017-03-11 17:04:55 +13:00
AudioPreferencesDialog.qml	Update preferences dialog titles to match menu items	2016-03-02 11:52:58 +13:00
AvatarAttachmentsDialog.qml	Force Qt (rather than OS) rendering in a number of places	2016-02-03 14:51:05 -08:00
AvatarPreferencesDialog.qml	snapshot fix	2017-02-06 19:39:57 +00:00
GeneralPreferencesDialog.qml	Make tablet general settings dialog naming more consistent with desktop	2017-03-02 12:30:36 +13:00
GraphicsPreferencesDialog.qml	Update preferences dialog titles to match menu items	2016-03-02 11:52:58 +13:00
LodPreferencesDialog.qml	Update preferences dialog titles to match menu items	2016-03-02 11:52:58 +13:00
ModelBrowserDialog.qml	Tablet and desktop versions of attachment model browser dialog	2017-03-11 15:38:21 +13:00
NetworkingPreferencesDialog.qml	Add settings to change local port	2016-09-06 10:18:42 -07:00
RunningScripts.qml	Fix the bug?	2016-12-21 17:53:30 -08:00
TabletAssetServer.qml	Implemented AssetBrowser in Tablet view	2017-03-06 21:45:55 +01:00
TabletLODTools.qml	Fixed slider groove size calculation. Added LOD Tools to Tablet UI	2017-03-11 14:44:33 +01:00
TabletRunningScripts.qml	fixed bring menu dialogs in tablet	2017-03-10 23:21:29 +00:00