ms merge
This commit is contained in:
@@ -141,16 +141,16 @@
|
||||
<Compile Include="frmFlowForm.vb">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="frmGlobixIndexFileList.Designer.vb">
|
||||
<DependentUpon>frmGlobixIndexFileList.vb</DependentUpon>
|
||||
<Compile Include="Globix\frmGlobix_IndexFileList.Designer.vb">
|
||||
<DependentUpon>frmGlobix_IndexFileList.vb</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="frmGlobixIndexFileList.vb">
|
||||
<Compile Include="Globix\frmGlobix_IndexFileList.vb">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="frmGlobix_Index.Designer.vb">
|
||||
<Compile Include="Globix\frmGlobix_Index.Designer.vb">
|
||||
<DependentUpon>frmGlobix_Index.vb</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="frmGlobix_Index.vb">
|
||||
<Compile Include="Globix\frmGlobix_Index.vb">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="frmSearchPredefined.Designer.vb">
|
||||
@@ -207,6 +207,7 @@
|
||||
<Compile Include="My Project\AssemblyInfo.vb" />
|
||||
<Compile Include="MyApplication.vb" />
|
||||
<Compile Include="Queries\ClassQueries.vb" />
|
||||
<Compile Include="Search\SearchFilter.vb" />
|
||||
<EmbeddedResource Include="frmAdministrationZooFlow.resx">
|
||||
<DependentUpon>frmAdministrationZooFlow.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
@@ -216,10 +217,10 @@
|
||||
<EmbeddedResource Include="frmFlowForm.resx">
|
||||
<DependentUpon>frmFlowForm.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="frmGlobixIndexFileList.resx">
|
||||
<DependentUpon>frmGlobixIndexFileList.vb</DependentUpon>
|
||||
<EmbeddedResource Include="Globix\frmGlobix_IndexFileList.resx">
|
||||
<DependentUpon>frmGlobix_IndexFileList.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="frmGlobix_Index.resx">
|
||||
<EmbeddedResource Include="Globix\frmGlobix_Index.resx">
|
||||
<DependentUpon>frmGlobix_Index.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="frmSearchPredefined.resx">
|
||||
|
||||
Reference in New Issue
Block a user