David Rowe 1f3045ad30 Merge branch 'master' into 21089 ... Conflicts: interface/src/Application.cpp		2016-12-13 14:05:24 +13:00
..
dialogs	Added preferences for the Perception Neuron plugin.	2016-11-23 10:10:00 -08: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	split ToolbarButton.qml into a stateful image part	2016-11-15 14:59:27 -08:00
Card.qml	animate suggestions when available	2016-11-21 16:46:10 -08:00
Desktop.qml	Merge branch 'master' into 21089	2016-12-13 14:05:24 +13:00
TextButton.qml	crazy workaround for qt bug	2016-11-16 17:03:24 -08:00