Michal Buzik b878ee96a5 Merge branch 'refs/heads/master-3' into feature/camera_jms ... # Conflicts: # TBF.sln.DotSettings.user # TBF/Properties/AssemblyInfo.cs # TBF/TBF.csproj # TBFTests/obj/Debug/TBFTests.csproj.CoreCompileInputs.cache # TBFTests/obj/Release/TBFTests.csproj.CoreCompileInputs.cache		2025-09-26 14:27:01 +02:00
..
Entities	final modification for AdjustableMeter.cs, Added units A,V ElectricUnits, calculation based on [A]	2024-01-24 17:35:56 +01:00
Properties	Dialog events added	2024-08-30 12:42:29 +02:00
Rig	Merge branch 'refs/heads/master-3' into feature/camera_jms	2025-09-26 14:27:01 +02:00
app.config	Dialog events added	2024-08-30 12:42:29 +02:00
packages.config	PL lang fix, camera test	2024-03-10 22:25:55 +01:00
TBFTests.csproj	Merge branch 'refs/heads/master-3' into feature/camera_jms	2025-09-26 14:27:01 +02:00