edv/AVISO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mergekonflike ausbessern;

Browse Source
This commit is contained in:
Andreas Luxbauer
2025-05-12 10:15:34 +02:00
parent 74817bffa8
commit f732845f15
16 changed files with 5377 additions and 2712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Aviso/Aviso.vbproj
View File

@@ -502,6 +502,18 @@
<SubType>UserControl</SubType>
</Compile>
<Compile Include="ApplicationEvents.vb" />
<Compile Include="ATEZ\frmATEZ_EZA.Designer.vb">
<DependentUpon>frmATEZ_EZA.vb</DependentUpon>
</Compile>
<Compile Include="ATEZ\frmATEZ_EZA.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="ATEZ\frmATEZ_NCTS.Designer.vb">
<DependentUpon>frmATEZ_NCTS.vb</DependentUpon>
</Compile>
<Compile Include="ATEZ\frmATEZ_NCTS.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="Auswertung\cStatFunctions.vb" />
<Compile Include="Auswertung\frmStatFrima.Designer.vb">
<DependentUpon>frmStatFrima.vb</DependentUpon>
@@ -690,12 +702,6 @@
<Compile Include="frmDigicust.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmATEZ_NCTS.Designer.vb">
<DependentUpon>frmATEZ_NCTS.vb</DependentUpon>
</Compile>
<Compile Include="frmATEZ_NCTS.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmATZollEingereichtSetzen.Designer.vb">
<DependentUpon>frmATZollEingereichtSetzen.vb</DependentUpon>
</Compile>
@@ -1226,6 +1232,12 @@
<EmbeddedResource Include="Anhänge\usrCntlSendungAnhangElement.resx">
<DependentUpon>usrCntlSendungAnhangElement.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ATEZ\frmATEZ_EZA.resx">
<DependentUpon>frmATEZ_EZA.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ATEZ\frmATEZ_NCTS.resx">
<DependentUpon>frmATEZ_NCTS.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Auswertung\frmStatFrima.resx">
<DependentUpon>frmStatFrima.vb</DependentUpon>
</EmbeddedResource>
@@ -1305,9 +1317,6 @@
<EmbeddedResource Include="frmDigicust.resx">
<DependentUpon>frmDigicust.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmATEZ_NCTS.resx">
<DependentUpon>frmATEZ_NCTS.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmATZollEingereichtSetzen.resx">
<DependentUpon>frmATZollEingereichtSetzen.vb</DependentUpon>
</EmbeddedResource>
@@ -1728,6 +1737,7 @@
<None Include="Resources\ambar_boarder.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Resources\Declarant.png" />
<Content Include="Resources\FO.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@@ -1748,6 +1758,7 @@
<None Include="Resources\reminder.png" />
<None Include="Resources\qr.png" />
<None Include="Resources\qr_s.png" />
<None Include="Resources\Transcode.png" />
<Content Include="Resources\WLAN\RunNHide.exe">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>