modified:   codelite/joiss/misc.project
	modified:   src/core/x_http.cpp
	modified:   src/core/x_timer.cpp
	modified:   src/host/aipstar/AipstarAdapter.cpp
	modified:   src/host/aipstar/AipstarChannel.cpp
	modified:   src/host/aipstar/AipstarStream.cpp
	modified:   src/misc/x_inet.cpp
	modified:   src/misc/x_sdk.cpp
Merge branch 'master' of https://github.com/joorhy/jorhy-prj