Merge remote-tracking branch 'origin/1.0.5' into development Conflicts: PartPreviewWindow/GcodeViewBasic.cs |
||
|---|---|---|
| .. | ||
| ToolsListControl.cs | ||
| ToolsListItem.cs | ||
| ToolsWidget.cs | ||
Merge remote-tracking branch 'origin/1.0.5' into development Conflicts: PartPreviewWindow/GcodeViewBasic.cs |
||
|---|---|---|
| .. | ||
| ToolsListControl.cs | ||
| ToolsListItem.cs | ||
| ToolsWidget.cs | ||