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
..
PortCore	CUST: - power correction prepared	2024-05-07 18:01:02 +02:00
SerialPorts	Merge branch 'Dev_Picking'	2025-05-27 10:46:18 +02:00