zhangxueyang
|
42752b94e7
|
Merge branch 'master' of http://git.xhkjedu.com/zhaoyaoyao/XHPZPC
# Conflicts:
# XHPZ.Desktop/MainWindow.xaml
|
il y a 3 ans |
zhangxueyang
|
a7a596db31
|
批注
|
il y a 3 ans |
耀
|
c3ffa44dd9
|
zhao:增加首页
|
il y a 3 ans |
zhangxueyang
|
52e6d59687
|
冲突
|
il y a 3 ans |
耀
|
7748876a0d
|
zhao:解决冲突
|
il y a 3 ans |
zhangxueyang
|
d11c26940e
|
Merge branch 'master' of http://git.xhkjedu.com/zhaoyaoyao/XHPZPC
# Conflicts:
# XHPZ.Desktop/APP.cs
# XHPZ.Desktop/XHPZ.Desktop.csproj
|
il y a 3 ans |
zhangxueyang
|
ab385f6d5d
|
批注
|
il y a 3 ans |
耀
|
a23bdc84b3
|
zhao:增加腾千里手写笔,增加图标
|
il y a 3 ans |
zhangxueyang
|
5cf881e8fd
|
Merge branch 'master' of http://git.xhkjedu.com/zhaoyaoyao/XHPZPC
|
il y a 3 ans |
zhangxueyang
|
a64ead8488
|
主页面
|
il y a 3 ans |
耀
|
747887b484
|
zhao:删除无用dll
|
il y a 3 ans |
耀
|
32111babc4
|
Revert "Revert "zhao:上传框架""
This reverts commit 47faf77b5e .
|
il y a 3 ans |
张剑
|
47faf77b5e
|
Revert "zhao:上传框架"
This reverts commit 7b65e39427 .
|
il y a 3 ans |
张剑
|
7b65e39427
|
zhao:上传框架
|
il y a 3 ans |