Permalink
Browse files

提交新添加上的厂区管理的内容

  • Loading branch information...
1 parent 09d0f49 commit a7686e638a458ee215638a4d2d67efcc3780c9b4 @hefangli hefangli committed Oct 29, 2012
@@ -14,7 +14,11 @@ namespace WorkStation
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
+<<<<<<< HEAD
+ Application.Run(new frmain());
+=======
Application.Run(new frmMain());
+>>>>>>> weiyunbing/Develop
}
}
}
@@ -174,6 +174,18 @@
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="SiteEditDelete.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="SiteEditDelete.Designer.cs">
+ <DependentUpon>SiteEditDelete.cs</DependentUpon>
+ </Compile>
+ <Compile Include="SiteNew.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="SiteNew.Designer.cs">
+ <DependentUpon>SiteNew.cs</DependentUpon>
+ </Compile>
<EmbeddedResource Include="frmAddCard.resx">
<DependentUpon>frmAddCard.cs</DependentUpon>
</EmbeddedResource>
@@ -244,6 +256,12 @@
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
+ <EmbeddedResource Include="SiteEditDelete.resx">
+ <DependentUpon>SiteEditDelete.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="SiteNew.resx">
+ <DependentUpon>SiteNew.cs</DependentUpon>
+ </EmbeddedResource>
<None Include="app.config" />
<None Include="ClassDiagram2.cd" />
<None Include="ClassDiagram3.cd" />
Oops, something went wrong.

0 comments on commit a7686e6

Please sign in to comment.