modified:   codelite/joiss/core.project
Merge branch 'master' of https://github.com/joorhy/jorhy-prj
Merge branch 'master' of https://github.com/joorhy/jorhy-prj
	modified:   codelite/joiss/core.project
	modified:   src/control/joiss/ControlManager.cpp
	modified:   src/control/play/PlayManager.cpp
	modified:   src/control/record/RecordMediaObj.cpp
	modified:   src/control/rymc/RymcParser.cpp
	modified:   src/control/stream/StreamManager.cpp
	modified:   src/control/stream/VoiceIcomObj.cpp
	modified:   src/core/j_common.h
	modified:   src/core/j_module.h
	modified:   src/core/x_asio.cpp
	modified:   src/core/x_asio.h
	modified:   src/core/x_http.cpp
	modified:   src/core/x_log.h
	modified:   src/core/x_socket.cpp
	modified:   src/host/hik/HikStream.cpp
	modified:   src/host/hik/HikStream.h
	modified:   src/host/jos/JoStream.cpp
	modified:   src/host/samsung/SamsungStream.cpp
	modified:   src/host/sony/SonyStream.cpp
	modified:   src/misc/x_sdk.cpp
	modified:   src/misc/x_sdk.h
	modified:   src/misc/x_vod_manager.cpp