Merge
This commit is contained in:
@@ -253,6 +253,12 @@
|
||||
<Compile Include="Globix\Models\DocumentType.vb" />
|
||||
<Compile Include="Globix\Models\ManualIndex.vb" />
|
||||
<Compile Include="Globix\Models\WorkFile.vb" />
|
||||
<Compile Include="frmWaitForm.Designer.vb">
|
||||
<DependentUpon>frmWaitForm.vb</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="frmWaitForm.vb">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="modCurrent.vb" />
|
||||
<Compile Include="MyDataset.Designer.vb">
|
||||
<AutoGen>True</AutoGen>
|
||||
@@ -432,6 +438,9 @@
|
||||
<EmbeddedResource Include="Globix\frmGlobixNameconvention.resx">
|
||||
<DependentUpon>frmGlobixNameconvention.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="frmWaitForm.resx">
|
||||
<DependentUpon>frmWaitForm.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Search\frmFlowSearch.resx">
|
||||
<DependentUpon>frmFlowSearch.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
|
||||
Reference in New Issue
Block a user