Cura/resources/qml/MainWindow
Daniel Schiavini a1c252d3a2 Revert "Revert "fix merge conflict""
This reverts commit 4bffa6d90f.
2018-12-07 10:25:46 +01:00
..
ApplicationMenu.qml Rename Toolbox menu to Marketplace. It was remove by mistake in a merge conflict. 2018-11-11 12:44:56 +01:00
MainWindowHeader.qml Revert "Revert "fix merge conflict"" 2018-12-07 10:25:46 +01:00