michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'm2' into master-2.26, ver. 2.26.1569

Browse Source
This commit is contained in:
Milan Hanajik
2021-01-07 14:42:07 +01:00
parent e9cc77a2d5 2981ab2a5f
commit 844f5573dc
17 changed files with 2527 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/TBF.csproj
+30
View File
@@ -543,6 +543,27 @@
<DependentUpon>TestStartEndForm.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\DataEntry\DEUtils.cs" />
<Compile Include="BenchControl\DataEntry\WMStates\EntryForm.cs" />
<Compile Include="BenchControl\DataEntry\WMStates\EntryFormCfg.cs" />
<Compile Include="BenchControl\DataEntry\WMStates\EntryFormCfgCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="BenchControl\DataEntry\WMStates\EntryFormCfgCtrl.designer.cs">
<DependentUpon>EntryFormCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\DataEntry\WMStates\EntryFormFactory.cs" />
<Compile Include="BenchControl\DataEntry\WMStates\WMSNsAndStatesForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="BenchControl\DataEntry\WMStates\WMSNsAndStatesForm.designer.cs">
<DependentUpon>WMSNsAndStatesForm.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\DataEntry\WMStates\WMStatesForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="BenchControl\DataEntry\WMStates\WMStatesForm.designer.cs">
<DependentUpon>WMStatesForm.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\Dummy\Balance\Component.cs" />
<Compile Include="BenchControl\Dummy\Balance\Factory.cs" />
<Compile Include="BenchControl\Dummy\Diverter\Component.cs" />
@@ -2862,6 +2883,15 @@
<EmbeddedResource Include="BenchControl\DataEntry\StandardCamera\TestStartEndForm.resx">
<DependentUpon>TestStartEndForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\DataEntry\WMStates\EntryFormCfgCtrl.resx">
<DependentUpon>EntryFormCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\DataEntry\WMStates\WMSNsAndStatesForm.resx">
<DependentUpon>WMSNsAndStatesForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\DataEntry\WMStates\WMStatesForm.resx">
<DependentUpon>WMStatesForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\Dummy\FlowMeter\FlowMeterCfgCtrl.resx">
<DependentUpon>FlowMeterCfgCtrl.cs</DependentUpon>
</EmbeddedResource>