Merge branch 'master' of git.mesalab.cn:AV/frag_rssb

# Conflicts:
#	src/main.c
This commit is contained in:
lishu
2018-12-11 23:08:27 +08:00
2 changed files with 8 additions and 4 deletions

View File

@@ -44,7 +44,7 @@ const char* frag_rssb_version_des = "MESA@iie rssb_maskey";
int FRAG_RSSB_VERSION_1_0_20181211 = 0;
const char* frag_rssb_version_time_in = "2018-12-11";
const char* frag_rssb_version_des_in = "unixsocket recv survey";
const char* frag_rssb_version_des_in = "resp_checkresult_search_media_cb add K_PROJECT";
void frag_rssb_history()
{
//2015.11.15 v1.0 create the project
@@ -226,6 +226,7 @@ void frag_rssb_history()
//2018.12.07 v4.0//unixsocket set bufsize timeout in configure
//2018.12.10 v4.0//1.recv_msg_fd not unix 2.MsgPort
//2018.12.11 v4.0//1.file mediatype
//2018.12.11 v4.0//resp_checkresult_search_media_cb add K_PROJECT,and delete send_json_log
}
frag_rssb_parameter_t g_frag_run;