modified:   codelite/joiss/joiss.workspace
	modified:   src/config/localConfig/LocalManager.cpp
	modified:   src/host/aipstar/AipstarChannel.cpp
	modified:   src/misc/x_resource_manager.cpp
	modified:   src/misc/x_sdk.cpp
Merge branch 'master' of https://github.com/joorhy/jorhy-prj
Merge branch 'master' of https://github.com/joorhy/jorhy-prj
	modified:   src/core/x_lock.cpp
	modified:   src/core/x_lock.h
	modified:   src/misc/x_adapter_factory.h