You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
liuguijing 8e064912de Merge branch 'master' of http://61.169.135.146:8081/git/xymp/MpLive
# Conflicts:
#	app/src/main/java/com/xypower/mplive/MainActivity.java
7 months ago
..
libs 和微拍对接改造 8 months ago
src/main Merge branch 'master' of http://61.169.135.146:8081/git/xymp/MpLive 7 months ago
.gitignore Seperate RTMP packet 9 years ago
build.gradle 更新RTMP server 7 months ago