modified:   codelite/joisc/joisc.tags
	modified:   codelite/joisc/joisc.workspace.session
	modified:   codelite/joiss/AipstarHost.project
	modified:   codelite/joiss/HikHost.project
	modified:   codelite/joiss/HikSdkHost.project
	modified:   codelite/joiss/HttpRequest.project
	modified:   codelite/joiss/JoHost.project
	modified:   codelite/joiss/JofsReader.project
	modified:   codelite/joiss/JoissManager.project
	modified:   codelite/joiss/JorReader.project
	modified:   codelite/joiss/JosStream.project
	modified:   codelite/joiss/JospControl.project
	modified:   codelite/joiss/JospRequest.project
	modified:   codelite/joiss/LocalConfig.project
	modified:   codelite/joiss/MCConfig.project
	modified:   codelite/joiss/MCControl.project
	modified:   codelite/joiss/joiss.project
	modified:   codelite/joiss/joiss.workspace
	modified:   codelite/joiss/misc.project
	modified:   src/host/aipstar/AipstarAdapter.h
	modified:   src/host/samsung/SamsungAdapter.h
	modified:   src/host/sony/SonyAdapter.h
Merge branch 'master' of https://github.com/joorhy/jorhy-prj