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
..
dialogs	Merge branch 'tablet-ui' into 21209	2017-03-14 08:50:01 +13:00
models	Attachment dialog	2016-01-26 21:55:40 -08:00
overlays	Fix image2d overlay color property	2016-06-08 14:04:02 +12:00
tablet	Merge branch 'tablet-ui' into 21209	2017-03-14 08:50:01 +13:00
toolbars	Fix for system toolbar hiding when scripts are reloaded	2017-02-21 17:24:22 -08:00
Card.qml	checking if desktop exists	2017-02-09 17:54:41 +00:00
Desktop.qml	Settings for Tablet Becomes Toolbar	2017-02-16 15:57:36 -08:00
LetterboxMessage.qml	Final commit?	2017-01-18 12:55:25 -08:00
NameCard.qml	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-03-01 12:55:54 -07:00
Pal.qml	fix broken merge	2017-03-07 12:10:52 -08:00
TextButton.qml	crazy workaround for qt bug	2016-11-16 17:03:24 -08:00