modified:   codelite/joisc/ivs.mk
	modified:   codelite/joisc/joisc.tags
	modified:   src/control/joiss/JoissManager.cpp
	modified:   src/control/joiss/MCManager.cpp
	modified:   src/control/record/RecordMediaObj.cpp
	modified:   src/core/x_http.cpp
	modified:   src/core/x_log.cpp
	modified:   src/core/x_ping.cpp
	modified:   src/host/aipstar/AipstarChannel.cpp
	modified:   src/misc/x_sdk.cpp
	modified:   src/ui/wx_ivs/src/x_decoder.cpp
	modified:   src/ui/wx_ivs/src/x_render.cpp
	modified:   src/ui/wx_ivs/src/x_video.cpp
Merge branch 'master' of https://github.com/joorhy/jorhy-prj