Dante Ruiz a89081601c fix merge issues		2017-04-06 22:31:47 +01:00
..
components	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
dialogs	Fixed BasicTableView.qml:610:17: QML Item: Binding loop detected for property width. width must be explicitly set	2017-04-04 16:35:21 +02: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	fix merge issues	2017-04-06 22:31:47 +01:00
toolbars	Fix for disappearing toolbar after reload all scripts	2017-03-29 14:10:26 -07:00
Audio.qml	Fix warning in Audio page. Revert commented out assert in OffscreenGLCanvas: move to separate task	2017-04-03 19:33:41 +02:00
Card.qml	toggle goto in tablet	2017-04-06 22:27:37 +01:00
ComboDialog.qml	style updates	2017-04-03 15:35:53 -07:00
Desktop.qml	Fix for disappearing toolbar after reload all scripts	2017-03-29 14:10:26 -07:00
LetterboxMessage.qml	Final commit?	2017-01-18 12:55:25 -08:00
NameCard.qml	updated, plus fixed some annoying errors in logs from Pal.qml	2017-04-06 11:16:51 -07:00
Pal.qml	Merge pull request #10138 from davidkelly/dk/3935	2017-04-06 14:05:25 -07:00
TabletTextButton.qml	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
TextButton.qml	crazy workaround for qt bug	2016-11-16 17:03:24 -08:00