David Rowe 625f5efdf8 Merge branch 'master' into 21164 ... # Conflicts: # scripts/system/audio.js		2017-02-15 10:00:52 +13:00
..
dialogs	snapshot fix	2017-02-06 19:39:57 +00: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 21164	2017-02-15 10:00:52 +13:00
toolbars	get button-states for toolbar buttons working again	2017-01-25 15:38:54 -08:00
Card.qml	checking if desktop exists	2017-02-09 17:54:41 +00:00
Desktop.qml	removed hud	2017-01-12 22:07:20 +00:00
LetterboxMessage.qml	Final commit?	2017-01-18 12:55:25 -08:00
NameCard.qml	Fix it	2017-02-01 12:32:30 -08:00
Pal.qml	Pal: Moved keyboard tray to be flush with bottom of window.	2017-02-08 18:16:48 -08:00
TextButton.qml	crazy workaround for qt bug	2016-11-16 17:03:24 -08:00