Commit Graph

6 Commits

Author SHA1 Message Date
dumeijied
d95b034457 Merge branch 'master' of git.mesalab.cn:AV_BACKEND/frag_rssb
# Conflicts:
#	src/main.c
2018-10-09 11:06:08 +08:00
dumeijied
ea42f42cd3 2018.10.08 v4.0//1.add send_voip_full_json_log for K_PROJECT;2.voip_fulllog and voip_surveylog add voice_dir and cap_ip opt 2018-10-09 10:50:48 +08:00
lishu
dc05b5fd01 20181008 survey_k 2018-10-08 16:16:22 +08:00
lishu
f292da01f2 keepalive 2018-10-08 13:23:27 +08:00
lishu
8121ece1e4 20180929 更新负载端口 2018-09-29 17:51:33 +08:00
lishu
19cfcaf353 20180929 first commit 2018-09-29 14:57:32 +08:00