Permalink
Browse files

修正性提交

  • Loading branch information...
1 parent 35b8a72 commit 94c3073930cb9e2c505934140b910eea0559f4ea @katway committed Oct 30, 2012
Showing with 210 additions and 140 deletions.
  1. +22 −3 Application/WorkStation.csproj.orig
  2. +105 −106 Application/frmMain.Designer.cs
  3. +1 −1 Application/frmMain.cs
  4. +82 −30 Application/frmMain.cs.orig
@@ -37,6 +37,7 @@
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="Microsoft.VisualBasic.PowerPacks.Vs, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="System" />
+ <Reference Include="System.configuration" />
<Reference Include="System.Core" />
<Reference Include="System.ServiceProcess" />
<Reference Include="System.Windows.Forms" />
@@ -173,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>
@@ -243,14 +256,20 @@
<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" />
<<<<<<< HEAD
- <None Include="ClassDiagram1.cd" />
+=======
<None Include="ClassDiagram2.cd" />
<None Include="ClassDiagram3.cd" />
<None Include="ClassDiagram4.cd" />
-=======
->>>>>>> weiyunbing/Develop
+ <None Include="ClassDiagram5.cd" />
+>>>>>>> hefangli/master
<None Include="Properties\Settings.settings">
<Generator>PublicSettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -347,6 +347,6 @@ private void tsmiDelMachine_Click(object sender, EventArgs e)
frmAddMachine machine = new frmAddMachine();
machine.Show();
}
-
+
}
}
Oops, something went wrong.

0 comments on commit 94c3073

Please sign in to comment.