projects
/
rtmpclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'dev'
[rtmpclient.git]
/
app
/
src
/
main
/
res
/
values
/
strings.xml
diff --git
a/app/src/main/res/values/strings.xml
b/app/src/main/res/values/strings.xml
index
83a1ab4
..
05a334a
100644
(file)
--- a/
app/src/main/res/values/strings.xml
+++ b/
app/src/main/res/values/strings.xml
@@
-3,7
+3,7
@@
<string name="btn">Button</string>
<string name="btnPlay">play</string>
<string name="labelServer">RTMP Server</string>
<string name="btn">Button</string>
<string name="btnPlay">play</string>
<string name="labelServer">RTMP Server</string>
- <string name="rtmpServer">rtmp://gpussh.suanzi.ai:1935/myapp</string>
+ <string name="rtmpServer">rtmp://gpussh.suanzi.ai:1935/myapp
/
</string>
<string name="labelUser">User</string>
<string name="user">suanzi</string>
<string name="labelCamera">Camera ID</string>
<string name="labelUser">User</string>
<string name="user">suanzi</string>
<string name="labelCamera">Camera ID</string>