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
..
AttachmentsTable.qml	Don't expand height of higlighted row	2017-03-11 15:46:43 +13:00
BaseWebView.qml	start on moving edit.js to tablet	2017-02-09 14:03:01 -08:00
Button.qml
CheckBox.qml	Scroll and snap to attachment with focus	2017-03-10 14:33:51 +13:00
ComboBox.qml	Make dropdown scrollbar wider	2017-03-11 12:59:15 +13:00
ContentSection.qml	diff minimize	2017-02-14 15:55:32 +00:00
GlyphButton.qml
HorizontalRule.qml
HorizontalSpacer.qml
Key.qml
Keyboard.qml
Label.qml
Slider.qml	Fixed slider groove size calculation. Added LOD Tools to Tablet UI	2017-03-11 14:44:33 +01:00
SpinBox.qml
Table.qml	Updates from Alan	2017-01-12 14:14:28 -08:00
TabletContentSection.qml	updated file headers	2017-02-14 16:08:25 +00:00
TabletHeader.qml	Merge branch 'tablet-ui' into 21209	2017-03-14 08:50:01 +13:00
TextAction.qml
TextEdit.qml
TextField.qml
Tree.qml
VerticalSpacer.qml
WebView.qml