Commits on Oct 31, 2012
  1. 修正.csproj文件

    committed Oct 31, 2012
Commits on Oct 30, 2012
  1. Merge remote-tracking branch 'qicb/Develop' into Develop

    Conflicts:
    	Application/WorkStation.csproj
    	Application/WorkStation.csproj.orig
    	Application/frmMain.Designer.cs
    	Application/frmMain.cs
    	Application/frmMain.cs.orig
    	Application/frmMain.resx
    committed Oct 30, 2012
  2. 修正性提交

    committed Oct 30, 2012
  3. 清理文件

    qicb committed Oct 30, 2012
  4. Merge remote-tracking branch 'origin/Develop' into Develop

    Conflicts:
    	Application/frmMain.cs
    	Application/frmMain.cs~HEAD
    	Application/frmain.cs
    qicb committed Oct 30, 2012
  5. main修正——点项

    qicb committed Oct 30, 2012
  6. Merge remote-tracking branch 'hefangli/master' into Develop

    Conflicts:
    	Application/WorkStation.csproj
    	Application/frmMain.Designer.cs
    	Application/frmMain.cs
    committed Oct 30, 2012
  7. 修正语法

    committed Oct 30, 2012
  8. Main修正提交

    qicb committed Oct 30, 2012
  9. Merge remote-tracking branch 'hefangli/master' into Develop

    Conflicts:
    	Application/Code/CommonClass.cs
    	Application/Code/SqlHelper.cs
    	Application/WorkStation.csproj
    	Application/frmAddTask.Designer.cs
    	Application/frmAddTask.cs
    	Application/frmMain.Designer.cs
    	Application/frmMain.cs
    	Application/frmMain.cs.orig
    	Application/frmMain.cs~HEAD
    	Application/frmain.cs
    qicb committed Oct 30, 2012
  10. 语法修正frmMain

    qicb committed Oct 30, 2012
  11. @hefangli

    提交项目的所有内容

    hefangli committed Oct 30, 2012
  12. Merge remote-tracking branch 'origin/Develop' into Develop

    dbf6887541ebaac3668.
    
    Conflicts:
    qicb committed Oct 30, 2012
  13. frmmain

    qicb committed Oct 30, 2012
  14. 巡检计划

    qicb committed Oct 30, 2012
  15. 忽略文件中增加.orig

    committed Oct 30, 2012
  16. Merge branch 'Develop' of https://github.com/katway/PatrolCheck into …

    …Develop
    
    Conflicts:
    	Application/Program.cs.orig
    	Application/frmMain.Designer.cs
    	Application/frmMain.cs
    	Application/frmMain.cs.orig
    committed Oct 30, 2012
Commits on Oct 29, 2012
  1. 巡检计划

    qicb committed Oct 29, 2012
  2. 修正性提交

    committed Oct 29, 2012
  3. Merge pull request #6 from hefangli/master

    所有内容提交
    committed Oct 29, 2012
  4. @hefangli
  5. 巡检计划

    qicb committed Oct 29, 2012
  6. @hefangli

    Merge remote-tracking branch 'weiyunbing/Develop'

    Conflicts:
    	Application/Program.cs
    	Application/WorkStation.csproj
    	Application/frmMain.cs
    hefangli committed Oct 29, 2012
  7. Merge remote-tracking branch 'hefangli/master' into Develop

    Conflicts:
    	Application/Program.cs
    	Application/frmMain.cs
    committed Oct 29, 2012
  8. @hefangli

    所有内容提交

    hefangli committed Oct 29, 2012
Commits on Oct 26, 2012
  1. 巡检计划

    qicb committed Oct 26, 2012
Commits on Oct 25, 2012
  1. 巡检计划

    qicb committed Oct 25, 2012
  2. @hefangli
Commits on Oct 24, 2012
  1. @hefangli
  2. 巡检信息OK

    qicb committed Oct 24, 2012
  3. Merge remote-tracking branch 'qicb/Develop' into Develop

    Conflicts:
    	Application/Code/SqlHelper.cs
    	Application/frmAddRoutName.cs
    	Application/frmAddRoute.cs
    committed Oct 24, 2012
  4. 修正性提交

    committed Oct 24, 2012
  5. 修改好

    qicb committed Oct 24, 2012
  6. Merge remote-tracking branch 'qicb/Develop' into Develop

    Conflicts:
    	Application/Code/CommonClass.cs
    	Application/Code/SqlHelper.cs
    	Application/Properties/Settings.Designer.cs
    	Application/Properties/Settings.settings
    	Application/WorkStation.csproj
    	Application/app.config
    	Application/frmAddItem.cs
    	Application/frmAddPoint.Designer.cs
    	Application/frmAddPoint.cs
    	Application/frmAddRoute.Designer.cs
    committed Oct 24, 2012