David Rowe 07697c5083 Merge branch 'master' into 21418 ... # Conflicts: # interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml # interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml Removed stray "Vive Controller Picks" configuration item which no longer exists.		2017-07-01 11:19:00 +12:00
..
audio	Merge pull request #10762 from zzmp/audio/input-select-active-level	2017-06-20 18:38:49 -07:00
dialogs	Merge branch 'master' into 21418	2017-07-01 11:19:00 +12: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 'master' into 21418	2017-07-01 11:19:00 +12:00
toolbars	Fix hover states on back/forward buttons	2017-04-14 12:43:07 -07:00
Card.qml	Annoncement Card visual tweeks.	2017-05-05 10:49:09 -07:00
ComboDialog.qml	UI changes - Thanks Alan!	2017-05-05 10:29:46 -07:00
Desktop.qml	Migrate to single QML engine	2017-06-05 15:14:44 -07:00
Feed.qml	cr feedback -- really good feedback in fact	2017-05-11 17:02:37 -07:00
LetterboxMessage.qml	Scattered X glyphs around the letterbox and combo dialogs	2017-04-07 11:12:54 -07:00
NameCard.qml	Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated	2017-06-23 14:23:20 -07:00
Pal.qml	Disable silence/ban buttons in PAL if avatar is replicated	2017-06-21 09:49:16 -07:00
TabletTextButton.qml	Added hover to Snaps and Places	2017-04-10 17:07:59 +02:00
TextButton.qml	crazy workaround for qt bug	2016-11-16 17:03:24 -08:00