howard-stearns 6aad78c8e8 Merge branch 'fogbugz_2028_part2' of https://github.com/zfox23/hifi into centered-toolbar		2016-11-03 11:23:47 -07:00
..
dialogs	Making progress...	2016-11-03 10:39:55 -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	Get ready for merge	2016-11-03 11:20:08 -07:00
Card.qml	Change 'Snapshot' to 'snapshot' and use smaller font	2016-11-01 14:49:18 -07:00
Desktop.qml	constrain toolbar based on setting. (ui for settings to come.)	2016-11-03 10:39:53 -07:00