Commit Graph

148 Commits

Author SHA1 Message Date
qinjiaming_branch fee6c38a85 merge 2016-08-30 10:44:15 +08:00
qinjiaming_branch b5c3b0020f Merge branch 'zhaozaichun' 2016-08-30 10:21:21 +08:00
qinjiaming_branch 84cbcb0be2 提交文档 2016-08-30 10:09:17 +08:00
qinjiaming_branch 4f844a90d8 合并赵再春前的提交 2016-08-30 10:06:13 +08:00
zzc bf6a90a591 移回分支 2016-08-30 09:52:36 +08:00
zzc e85abefd10 删除本地 2016-08-30 09:51:35 +08:00
qinjiaming_branch 406ede7f36 Merge remote-tracking branch 'remotes/origin/qinjiaming_branch' 2016-08-30 09:47:07 +08:00
zzc b0810e1896 修改 2016-08-30 09:44:11 +08:00
qinjiaming_branch 9befe9ae76 1111 2016-08-30 09:36:44 +08:00
qinjiaming_branch 5a7f4c3881 合并赵再春分支。 2016-08-30 09:19:34 +08:00
qinjiaming_branch 424ec44904 报错。 2016-08-30 09:02:07 +08:00
qinjiaming_branch d898f42da5 改动模型。 2016-08-30 08:42:50 +08:00
qinjiaming_branch e929b22f5e 更新了UML图。 2016-08-30 08:36:54 +08:00
qinjiaming_branch 9605b5b810 上传覃佳明的顺序图。 2016-08-30 08:21:46 +08:00
qinjiaming_branch 5afa9af69a 修改了顺序图 2016-08-30 08:18:41 +08:00
qinjiaming_branch 84c742190f Merge branch 'master' of https://git.trustie.net/kaka727/shangwen666 2016-08-30 08:11:07 +08:00
qinjiaming_branch 6112020442 修改代码。 2016-08-30 08:01:30 +08:00
zzc 9dbc66b9f5 部署图补充 2016-08-29 11:47:40 +08:00
zzc 403edef0e9 界面类图和顺序图补充 2016-08-29 11:13:53 +08:00
kaka727 e621789e14 修改 2016-08-29 11:13:07 +08:00
kaka727 45d19e4178 Merge branch 'master' of https://git.trustie.net/kaka727/shangwen666 2016-08-29 11:05:33 +08:00
kaka727 5714e0383b 文档和模型中的子系统顺序图 2016-08-29 11:00:05 +08:00
qinjiaming_branch dd0e5ca252 合并赵再春。 2016-08-29 10:53:35 +08:00
zzc 672b18ea3a 删除2.0版本 2016-08-29 10:51:07 +08:00
zzc 31106ecba2 修改 2016-08-29 10:29:16 +08:00
qinjiaming_branch 417b9a334b 修改。 2016-08-29 10:16:07 +08:00
qinjiaming_branch 06546057a3 删除了错误版本。 2016-08-29 10:15:15 +08:00
qinjiaming_branch 0aeeb50eb2 Merge branch 'qinjiaming_branch' 2016-08-29 10:12:07 +08:00
qinjiaming_branch 5f20e564e7 修改。 2016-08-29 10:08:03 +08:00
qinjiaming_branch 09cf04ed7d Merge branch 'master' of https://git.trustie.net/kaka727/shangwen666 2016-08-29 10:06:39 +08:00
qinjiaming_branch b02d1cf5ef 修改。 2016-08-29 10:05:57 +08:00
王尚文 a1a4b7fa4f Merge branch 'zhaozaichun' into 'master'
界面修改

嘎嘎鸭

See merge request !6
2016-08-29 09:44:28 +08:00
qinjiaming_branch 762ff22b6c 更新了顺序图。 2016-08-29 09:42:22 +08:00
qinjiaming_branch 5b7dc9e4aa 删除了旧版本。 2016-08-29 09:41:39 +08:00
qinjiaming_branch 02d87d4f4b 合并后的代码。 2016-08-29 09:38:58 +08:00
qinjiaming_branch a324c31647 合并赵再春的分支。 2016-08-29 09:35:02 +08:00
qinjiaming_branch 52ad396005 改动了顺序图 2016-08-29 09:21:19 +08:00
zzc 5e7e4fcb0f 界面修改最终版 2016-08-29 08:41:06 +08:00
qinjiaming_branch 1e89a44038 Merge branch 'master' of https://git.trustie.net/kaka727/shangwen666 2016-08-28 20:50:13 +08:00
qinjiaming_branch 8fb1246607 Merge branch 'qinjiaming_branch' 2016-08-28 20:48:27 +08:00
qinjiaming_branch a748034f71 基本完成“主要”级别错误的改动。 2016-08-28 20:41:57 +08:00
qinjiaming_branch dc2b814182 改正错误。 2016-08-28 20:23:37 +08:00
qinjiaming_branch 83db9fd57c Merge branch 'qinjiaming_branch' 2016-08-28 20:10:47 +08:00
qinjiaming_branch 97d6ab17e2 改正了一些“主要”级别的错误。 2016-08-28 20:04:37 +08:00
kaka727 2f23a18077 Merge branch 'master' of https://git.trustie.net/kaka727/shangwen666 2016-08-26 21:49:48 +08:00
kaka727 2f41ba4c20 2016.8.26 修改文档 2016-08-26 21:45:12 +08:00
qinjiaming_branch 8da8ac1d0f Merge branch 'qinjiaming_branch' 2016-08-26 19:18:38 +08:00
qinjiaming_branch 6a1f252163 改动了很多类,改动了主要错误中unused的错误。 2016-08-26 19:14:25 +08:00
qinjiaming_branch 5830d4936b 修改了很多类。 2016-08-26 11:44:18 +08:00
qinjiaming_branch 0589972ab4 严重代码修改基本完成。 2016-08-26 11:00:20 +08:00