Thomas Wiedebusch cd335f6686 Merge branch 'Dev_Picking' ... # Conflicts: # Common/.shared/SharedAssemblyInfo.cs # Common/Production/ProductionUiCordonel/App.config # Common/Production/ProductionUiCordonel/App.xaml.cs # Common/Production/ProductionUiCordonel/ProductionUiCordonel.csproj # Common/Production/ProductionUiCordonel/ProductionWindow.xaml # Common/Production/ProductionUiCordonel/ProductionWindow.xaml.cs		2025-05-27 10:46:18 +02:00
..
Ports	Merge branch 'Dev_Picking'	2025-05-27 10:46:18 +02:00
Protocols	VSFM omni+ 02-07-2024	2024-07-03 10:35:45 +02:00