AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

MS Corrections after Conflict

Browse Source
This commit is contained in:
Digital Data - Marlon Schreiber
2018-09-25 09:10:36 +02:00
parent 72c7d94f0e ed0759d590
commit 3d903b627b
21 changed files with 1909 additions and 3668 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
View File

@@ -116,6 +116,9 @@
<Reference Include="DLLLicenseManager">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll</HintPath>
</Reference>
<Reference Include="FormsUtils">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\FormsUtils.dll</HintPath>
</Reference>
<Reference Include="Independentsoft.Msg, Version=2.0.140.29929, Culture=neutral, PublicKeyToken=76be97fe952f1ec7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.dll</HintPath>
@@ -158,6 +161,7 @@
<Compile Include="ClassDragDrop.vb" />
<Compile Include="ClassFinalIndex.vb" />
<Compile Include="ClassFinalizeDoc.vb" />
<Compile Include="ClassIndexListConverter.vb" />
<Compile Include="ClassInit.vb" />
<Compile Include="ClassLogger.vb" />
<Compile Include="ClassSQLEditor.vb" />
@@ -640,6 +644,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="PM_ohne_slogan_128px.ico" />
<None Include="Resources\cancel.png" />
<None Include="Resources\shape_square_go.png" />
<None Include="Resources\Checked-outforEdit_Color_13297.png" />
<None Include="Resources\Settings.png" />