projects
/
protocol_srv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7f1d25b
1746107
)
Merge branch 'sl8541_common' of server-git:incartech/protocol_srv into sl8541_common
author
TrillGates
<williamtrillgates@gmail.com>
Fri, 27 Aug 2021 06:21:34 +0000
(14:21 +0800)
committer
TrillGates
<williamtrillgates@gmail.com>
Fri, 27 Aug 2021 06:21:34 +0000
(14:21 +0800)
1
2
app/src/main/AndroidManifest.xml
patch
|
diff1
|
diff2
|
blob
|
history
app/src/main/java/com/ic/protocolSrv/Config.java
patch
|
diff1
|
diff2
|
blob
|
history
app/src/main/java/com/ic/protocols/protocol_fzd.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
app/src/main/AndroidManifest.xml
Simple merge
diff --cc
app/src/main/java/com/ic/protocolSrv/Config.java
Simple merge
diff --cc
app/src/main/java/com/ic/protocols/protocol_fzd.java
Simple merge
projects / protocol_srv.git / commitdiff