Merge branch 'clh' into liuyang

mrDarker

6 天以前 829fe6c6bc33d53fda9c31fd45a37e1df87befff

 SourceCode/Bond/Servo/Servo.vcxproj.filters

@@ -174,6 +174,7 @@
    <ClCompile Include="CReport.cpp" />
    <ClCompile Include="CVariable.cpp" />
    <ClCompile Include="CPageVarialbles.cpp" />
    <ClCompile Include="CPageDataVarialbles.cpp" />
    <ClCompile Include="CPageReport.cpp" />
    <ClCompile Include="CPageCollectionEvent.cpp" />
    <ClCompile Include="ProcessJob.cpp" />
@@ -232,6 +233,18 @@
    <ClCompile Include="CUserManager2.cpp" />
    <ClCompile Include="CUserManager2Dlg.cpp" />
    <ClCompile Include="CUserEdit2Dlg.cpp" />
    <ClCompile Include="CUserXLogDlg.cpp" />
    <ClCompile Include="CVariableEditDlg2.cpp" />
    <ClCompile Include="CEventEditDlg.cpp" />
    <ClCompile Include="CReportEditDlg.cpp" />
    <ClCompile Include="ConfigurationProduction.cpp" />
    <ClCompile Include="CPanelProduction.cpp" />
    <ClCompile Include="ProductionStats.cpp" />
    <ClCompile Include="AccordionWnd.cpp" />
    <ClCompile Include="CPageProdOverview.cpp" />
    <ClCompile Include="HmLabel.cpp" />
    <ClCompile Include="CPageCtrlState.cpp" />
    <ClCompile Include="AlarmPopupDlg.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="AlarmManager.h" />
@@ -253,6 +266,7 @@
    <ClInclude Include="stdafx.h" />
    <ClInclude Include="targetver.h" />
    <ClInclude Include="TerminalDisplayDlg.h" />
    <ClInclude Include="ProductionStats.h" />
    <ClInclude Include="SECSRuntimeManager.h" />
    <ClInclude Include="CCLinkPerformance\CCLinkIEControl.h">
      <Filter>CCLinkPerformance</Filter>
@@ -411,6 +425,7 @@
    <ClInclude Include="CReport.h" />
    <ClInclude Include="CVariable.h" />
    <ClInclude Include="CPageVarialbles.h" />
    <ClInclude Include="CPageDataVarialbles.h" />
    <ClInclude Include="CPageReport.h" />
    <ClInclude Include="CPageCollectionEvent.h" />
    <ClInclude Include="ProcessJob.h" />
@@ -507,6 +522,16 @@
    <ClInclude Include="CUserManager2.h" />
    <ClInclude Include="CUserManager2Dlg.h" />
    <ClInclude Include="CUserEdit2Dlg.h" />
    <ClInclude Include="CUserXLogDlg.h" />
    <ClInclude Include="CVariableEditDlg2.h" />
    <ClInclude Include="CEventEditDlg.h" />
    <ClInclude Include="CReportEditDlg.h" />
    <ClInclude Include="CPanelProduction.h" />
    <ClInclude Include="AccordionWnd.h" />
    <ClInclude Include="CPageProdOverview.h" />
    <ClInclude Include="HmLabel.h" />
    <ClInclude Include="CPageCtrlState.h" />
    <ClInclude Include="AlarmPopupDlg.h" />
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="Servo.rc" />