Compare commits
merge into: Egalware/icarus:FlowDocument
Egalware/icarus:main
Egalware/icarus:feature/ExportForMachine
Egalware/icarus:feature/Tooltip
Egalware/icarus:feature/ColorPicker
Egalware/icarus:feature/OpenDialog
Egalware/icarus:feature/DifferentTypeWidth
Egalware/icarus:develop
Egalware/icarus:feature/Beta&SlicingHeightParam
Egalware/icarus:feature/InfillParams
Egalware/icarus:feature/MessageBox
Egalware/icarus:FlowDocument
Egalware/icarus:NewWidow
Egalware/icarus:NewInterface
Egalware/icarus:ImportExportMaterialDb
Egalware/icarus:Manual&Tutorial
Egalware/icarus:MinorFix
Egalware/icarus:ImportExportMachiningDb&Material
Egalware/icarus:ManageMaterialNone
Egalware/icarus:NewImportModifyPart
Egalware/icarus:SplashScreen
Egalware/icarus:ModifyPart
Egalware/icarus:feature/HorizontalSlider
...
pull from: Egalware/icarus:ImportExportMaterialDb
Egalware/icarus:main
Egalware/icarus:feature/ExportForMachine
Egalware/icarus:feature/Tooltip
Egalware/icarus:feature/ColorPicker
Egalware/icarus:feature/OpenDialog
Egalware/icarus:feature/DifferentTypeWidth
Egalware/icarus:develop
Egalware/icarus:feature/Beta&SlicingHeightParam
Egalware/icarus:feature/InfillParams
Egalware/icarus:feature/MessageBox
Egalware/icarus:FlowDocument
Egalware/icarus:NewWidow
Egalware/icarus:NewInterface
Egalware/icarus:ImportExportMaterialDb
Egalware/icarus:Manual&Tutorial
Egalware/icarus:MinorFix
Egalware/icarus:ImportExportMachiningDb&Material
Egalware/icarus:ManageMaterialNone
Egalware/icarus:NewImportModifyPart
Egalware/icarus:SplashScreen
Egalware/icarus:ModifyPart
Egalware/icarus:feature/HorizontalSlider
These branches are equal.