Commit graph

2 commits

Author SHA1 Message Date
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
David Rowe
6a8d0b1064 Refactor some tablet dialog headers 2017-03-11 16:55:22 +13:00