Permalink
Switch branches/tags
Nothing to show
Commits on Oct 31, 2012
  1. 基础核心功能初步完成

    katway committed Oct 31, 2012
    1.任务管理,基础信息,卡片管理
  2. 修正.csproj文件

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

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

    katway committed Oct 30, 2012
  3. 清理文件

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

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

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

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

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

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

    qicb committed Oct 30, 2012
    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 committed Oct 30, 2012
  11. 提交项目的所有内容

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

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

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

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

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

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

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

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

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

    qicb committed Oct 29, 2012
  5. Merge remote-tracking branch 'weiyunbing/Develop'

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

    katway committed Oct 29, 2012
    Conflicts:
    	Application/Program.cs
    	Application/frmMain.cs
  7. 所有内容提交

    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
Commits on Oct 24, 2012
  1. 巡检信息OK

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

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

    katway committed Oct 24, 2012
  4. 修改好

    qicb committed Oct 24, 2012