Michal Buzik a0201427ca Merge branch 'master-3' into feature/master3_Cordonel ... # Conflicts: # AppDiagnostic/BufferedListView.cs # AppDiagnostic/DiagApi.cs # AppDiagnostic/LogAdapter.cs # AppDiagnostic/LogFilter.cs # AppDiagnostic/MainForm.Designer.cs # AppDiagnostic/MainForm.cs # AppDiagnostic/MainForm.resx # AppDiagnostic/Program.cs # AppDiagnostic/Properties/AssemblyInfo.cs # AppDiagnostic/Properties/Resources.resx # SharedComponents/LiveLogCache.cs # SharedComponents/SharedComponents.csproj # TBF/Rig/Uni/RegValveLowRegulTimeSaturation/ChangeRegValvePositionOp.cs # TBF/Rig/Uni/RegValveLowRegulTimeSaturation/Factory.cs # TBF/Rig/Uni/RegValveLowRegulTimeSaturation/Handlers.cs # TBF/Rig/Uni/RegValveLowRegulTimeSaturation/RegValve.cs # TBF/Rig/Uni/RegValveLowRegulTimeSaturation/RegValveCfg.cs # TBF/Rig/Uni/RegValveLowRegulTimeSaturation/RegValveCfgCtrl.cs # TBF/Rig/Uni/RegValveLowRegulTimeSaturation/SetFlowOp.cs # TBF/Rig/Uni/RegValveLowRegulTimeSaturation/SetRegValvePositionOp.cs # TBF/TBF.csproj # TBFTests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache # TBFTests/obj/Debug/TBFTests.csproj.AssemblyReference.cache # TBFTests/obj/Debug/TBFTests.csproj.CoreCompileInputs.cache # TBFTests/obj/Debug/TBFTests.csproj.FileListAbsolute.txt # TBFTests/obj/Release/TBFTests.csproj.AssemblyReference.cache		2026-01-29 14:06:14 +01:00
..
obj	Merge branch 'master-3' into feature/master3_Cordonel	2026-01-29 14:06:14 +01:00
LiveLogCache.cs	Merge branch 'master-3' into feature/master3_Cordonel	2026-01-29 14:06:14 +01:00
SharedComponents.csproj	Add initial implementation for AppDiagnostic project	2025-09-07 22:13:58 +02:00