howard-stearns abb63139f6 Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions		2016-07-18 16:29:49 -07:00
..
dialogs	Merge pull request #8179 from SamGondelman/snapshotFix3	2016-07-12 15:28:51 -07: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
toolbars	Fix hover states for toolbar buttons	2016-07-15 17:12:49 -07:00
Card.qml	Remove now-superflous Column.	2016-07-15 17:01:37 -07:00
Desktop.qml	make hud button participate in buttonState just like other toolbar	2016-07-01 13:54:00 -07:00