Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
merge Master into zj/develop #21
merge Master into zj/develop #21
Changes from all commits
6f24d92
1600dcf
66027d0
d2e40b4
b537eae
81edd93
55b822e
06d73d0
ef2ce66
b495587
51b9a1e
11e6278
9ac0679
7ff5981
91eab12
28690a2
1531b06
58d6f3c
2a407fb
b136ce4
3ba3211
b076be7
cc4a2ae
c4b6912
4fa1520
c176952
464f85f
69fdb27
6b7e6d1
07eaade
25ec8d1
a233d7d
a79415e
1ed7f9e
d595892
b79be4f
31c922e
44886c1
bfaa258
8dfb3e1
6cf1bae
9674b41
ebbcab6
3526beb
601043c
5759b7e
d8ad86c
8ffab16
8076433
3253b23
09601e1
dd580f2
a645784
4ee6a03
8f01ed9
0f3ebdc
d024f82
9e38f03
b8b8eaa
8683fec
42fb865
2c53513
b6bd1ac
8877ae6
a3b19ed
5fbf385
d1a7d24
62b2504
28e687f
52ab1ee
4d9dac4
dbe120d
2733168
e15a8bc
4856d69
6ccedd3
f57b0a0
90a6b10
ec81c76
000072f
c677eea
3d0de2a
84cbd47
c25ae2b
2f1a1ae
3857e57
ba0f0c2
26150ed
ae33d7f
e9b7a4b
d6f1fcb
66df6c0
737878e
7664464
4153e74
338a91e
f721e94
d0356a0
349b1db
882ba2f
cf27cde
b542e15
fdd12e1
1307edf
5f615c1
8028e07
3432969
ad5b104
60bc35c
60827b0
146288e
73f84df
8795f81
7007647
5555959
a91d570
c7f8e16
4a316ab
70bb9be
d56e712
abccd44
08b94f4
b842f8a
d310e5e
5b9194c
bfe0765
f06bd60
01d72db
670adfb
eba8f19
a10c1fb
fef142b
9f1d6c6
2170a12
d3fba10
8750602
34e8fd5
5bad1ca
b38c675
a2e5ba5
0107361
3b547ac
5b8206e
506cb3f
881f54b
a61720b
4d11231
0afda50
829e253
e25d3c0
1d466b4
594a358
31df497
58576b5
6351b25
499b4dc
d531f94
59eb330
104e01d
b9f449f
7e71d4c
dad9f88
2f77d59
3e0cede
c4dc1c4
4b12dbb
e297d1f
b32d46d
9ee553b
34b6d54
738c4b0
29c6a3c
39e4fe6
f0d5359
9f5a1f6
8cde8d1
a8982ef
23298ea
651a6ea
f59583e
b9165b9
230b510
991a4e2
67c2036
88f147d
94a4467
d12f06b
f45a978
6843c5d
694d397
6e26cbb
0db31e9
9ed88b0
0ccbae9
a0f0985
d9bad54
d92efa6
8f91128
aef37f3
b22e7dc
476a29c
e291399
83ab665
49dd66d
6b20fce
9a1fc46
952d1a1
978942c
1b7c31f
dd98909
ef9d83b
4ccf3ed
27e94d2
381fb6c
4bdbf95
5086f32
4338d96
7ecb256
f1bbad6
f619b45
9c8644b
2a3e875
c846b0a
f61a161
0dcb5fa
4a33514
c0f06fd
cd3b126
7c34b18
338be20
d5392bf
a86efb6
dbbc917
6d899af
e4016b8
cbea1ad
8f5745b
0d91cf6
68f932c
75fb926
4956899
b0369f9
cd96862
e4f6666
88035cc
e3a9b89
5259a7c
7040a48
854e6a7
931d3b5
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing