merge
This commit is contained in:
@@ -142,16 +142,10 @@
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Administration\frmAdmin_Interface.vb" />
|
||||
<Compile Include="Administration\frmAdmin_SourceSQL.Designer.vb">
|
||||
<DependentUpon>frmAdmin_SourceSQL.vb</DependentUpon>
|
||||
<Compile Include="Administration\frmAdmin_Globix.Designer.vb">
|
||||
<DependentUpon>frmAdmin_Globix.vb</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Administration\frmAdmin_SourceSQL.vb">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Administration\frmGlobix_Dokumentart.Designer.vb">
|
||||
<DependentUpon>frmGlobix_Dokumentart.vb</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Administration\frmGlobix_Dokumentart.vb">
|
||||
<Compile Include="Administration\frmAdmin_Globix.vb">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Administration\SourceBundle.vb" />
|
||||
@@ -326,11 +320,8 @@
|
||||
<EmbeddedResource Include="Administration\frmAdmin_IDBEntity.resx">
|
||||
<DependentUpon>frmAdmin_IDBEntity.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Administration\frmAdmin_SourceSQL.resx">
|
||||
<DependentUpon>frmAdmin_SourceSQL.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Administration\frmGlobix_Dokumentart.resx">
|
||||
<DependentUpon>frmGlobix_Dokumentart.vb</DependentUpon>
|
||||
<EmbeddedResource Include="Administration\frmAdmin_Globix.resx">
|
||||
<DependentUpon>frmAdmin_Globix.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="frmtest.resx">
|
||||
<DependentUpon>frmtest.vb</DependentUpon>
|
||||
@@ -706,16 +697,7 @@
|
||||
<None Include="Resources\save6.svg" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\actions_check4.svg" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\save7.svg" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\delete.svg" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\managedatasource1.svg" />
|
||||
<None Include="Resources\Datasource_16x16.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\about4.svg" />
|
||||
|
||||
Reference in New Issue
Block a user