陶汉栋 / ParentWork | GitLab

11 Apr, 2018

1 commit

41f159b5 Merge branch 'developer' into wwx Browse Dir »

段合江
2018-04-11 09:15:38 +0800

10 Apr, 2018

1 commit

7cd6b667 no message Browse Dir »

陶汉栋
2018-04-10 11:00:16 +0800

08 Apr, 2018

1 commit

07503a80 no message Browse Dir »

姚旭斌
2018-04-08 10:35:11 +0800

04 Apr, 2018

7 commits

a299f710 Merge branch 'developer' into yxb_dev ... Browse Dir »
```
# Conflicts:
#	.idea/modules.xml
#	app/libs/processor.jar
```
姚旭斌
2018-04-04 21:43:39 +0800
c45f5ac9 Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

陶汉栋
2018-04-04 18:48:23 +0800
9bb016c5 no message Browse Dir »

陶汉栋
2018-04-04 18:48:15 +0800
afec02d6 no message Browse Dir »

姚旭斌
2018-04-04 15:19:23 +0800
a52d9fd6 no message Browse Dir »

张道锋
2018-04-04 10:39:55 +0800
9ee7c30c Merge branch 'developer' into yxb_dev ... Browse Dir »
```
# Conflicts:
#	app/libs/processor.jar
```
姚旭斌
2018-04-04 09:52:49 +0800
6a4eb0f4 Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Dir »
```
# Conflicts:
#	app/libs/processor.jar
```
张道锋
2018-04-04 09:34:02 +0800

02 Apr, 2018

1 commit

61f40825 no message Browse Dir »

陶汉栋
2018-04-02 14:32:25 +0800

30 Mar, 2018

2 commits

cb057a09 no message Browse Dir »

姚旭斌
2018-03-30 14:56:23 +0800
42f883a1 no message Browse Dir »

张道锋
2018-03-30 10:40:49 +0800

29 Mar, 2018

3 commits

762b1b1d Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

张道锋
2018-03-29 18:09:40 +0800
1612af77 no message Browse Dir »

张道锋
2018-03-29 18:09:36 +0800
1dffc346 no message Browse Dir »

陶汉栋
2018-03-29 09:32:39 +0800

28 Mar, 2018

2 commits

47a38b09 no message Browse Dir »

陶汉栋
2018-03-28 19:36:02 +0800
62be613c no message Browse Dir »

姚旭斌
2018-03-28 19:35:03 +0800

27 Mar, 2018

2 commits

e60e729f no message Browse Dir »

张道锋
2018-03-27 16:54:23 +0800
4f854ee0 no message Browse Dir »

张道锋
2018-03-27 16:54:18 +0800

26 Mar, 2018

13 commits

853d6390 no message Browse Dir »

陶汉栋
2018-03-26 15:33:00 +0800
99e7abd3 no message Browse Dir »

姚旭斌
2018-03-26 15:32:56 +0800
b641fe18 Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

陶汉栋
2018-03-26 15:30:56 +0800
1ff2fc66 Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-03-26 15:27:18 +0800
38a05c04 no message Browse Dir »

张道锋
2018-03-26 15:25:50 +0800
c0619d56 no message Browse Dir »

陶汉栋
2018-03-26 15:23:32 +0800
7138f165 no message Browse Dir »

陶汉栋
2018-03-26 13:08:17 +0800
78184bb7 no message Browse Dir »

张道锋
2018-03-26 10:23:30 +0800
183c91ed no message Browse Dir »

陶汉栋
2018-03-26 10:21:07 +0800
b0bddad4 Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-03-26 10:20:17 +0800
325cb7bb Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

陶汉栋
2018-03-26 10:17:23 +0800
8c9c3f09 Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

张道锋
2018-03-26 10:08:18 +0800
a4ba63a7 no message Browse Dir »

张道锋
2018-03-26 10:07:59 +0800

24 Mar, 2018

2 commits

e456fe36 Merge branch 'developer' into yxb_dev ... Browse Dir »
```
# Conflicts:
#	.idea/modules.xml
```
姚旭斌
2018-03-24 09:43:47 +0800
8d78127a no message Browse Dir »

姚旭斌
2018-03-24 09:43:02 +0800

23 Mar, 2018

2 commits

d106d2db Merge branch 'developer' into yxb_dev ... Browse Dir »
```
# Conflicts:
#	app/src/main/AndroidManifest.xml
```
姚旭斌
2018-03-23 16:19:57 +0800
abf181bd no message Browse Dir »

张道锋
2018-03-23 16:01:44 +0800

22 Mar, 2018

1 commit

50ca3597 no message Browse Dir »

张道锋
2018-03-22 11:06:39 +0800

21 Mar, 2018

2 commits

561e50fc Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

陶汉栋
2018-03-21 09:52:55 +0800
10a30b8e no message Browse Dir »

姚旭斌
2018-03-21 09:23:27 +0800