Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Branch: Develop
Commits on Oct 31, 2012
  1. 修正.csproj文件

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

    authored
    Conflicts:
    	Application/WorkStation.csproj
    	Application/WorkStation.csproj.orig
    	Application/frmMain.Designer.cs
    	Application/frmMain.cs
    	Application/frmMain.cs.orig
    	Application/frmMain.resx
  2. 修正性提交

    authored
  3. 清理文件

    qicb authored
  4. Merge remote-tracking branch 'origin/Develop' into Develop

    qicb authored
    Conflicts:
    	Application/frmMain.cs
    	Application/frmMain.cs~HEAD
    	Application/frmain.cs
  5. main修正——点项

    qicb authored
  6. Merge remote-tracking branch 'hefangli/master' into Develop

    authored
    Conflicts:
    	Application/WorkStation.csproj
    	Application/frmMain.Designer.cs
    	Application/frmMain.cs
  7. 修正语法

    authored
  8. Main修正提交

    qicb authored
  9. Merge remote-tracking branch 'hefangli/master' into Develop

    qicb authored
    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
  10. 语法修正frmMain

    qicb authored
  11. @hefangli

    提交项目的所有内容

    hefangli authored
  12. Merge remote-tracking branch 'origin/Develop' into Develop

    qicb authored
    dbf6887541ebaac3668.
    
    Conflicts:
  13. frmmain

    qicb authored
  14. 巡检计划

    qicb authored
  15. 忽略文件中增加.orig

    authored
  16. Merge branch 'Develop' of https://github.com/katway/PatrolCheck into …

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

    qicb authored
  2. 修正性提交

    authored
  3. Merge pull request #6 from hefangli/master

    authored
    所有内容提交
  4. @hefangli
  5. 巡检计划

    qicb authored
  6. @hefangli

    Merge remote-tracking branch 'weiyunbing/Develop'

    hefangli authored
    Conflicts:
    	Application/Program.cs
    	Application/WorkStation.csproj
    	Application/frmMain.cs
  7. Merge remote-tracking branch 'hefangli/master' into Develop

    authored
    Conflicts:
    	Application/Program.cs
    	Application/frmMain.cs
  8. @hefangli

    所有内容提交

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

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

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

    qicb authored
  3. Merge remote-tracking branch 'qicb/Develop' into Develop

    authored
    Conflicts:
    	Application/Code/SqlHelper.cs
    	Application/frmAddRoutName.cs
    	Application/frmAddRoute.cs
  4. 修正性提交

    authored
  5. 修改好

    qicb authored
  6. Merge remote-tracking branch 'qicb/Develop' into Develop

    authored
    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
Something went wrong with that request. Please try again.