secret
Merge branch 'Gants2'

Conflicts:
	TizenProject/.sdk_delta.info
	TizenProject/.sign/.manifest.tmp
	TizenProject/.sign/author-signature.xml
	TizenProject/.sign/signature1.xml
	TizenProject/src/Idl_tutorial1.cpp
Merge branch 'Gants2'

Conflicts:
	TizenProject/.sdk_delta.info
	TizenProject/.sign/.manifest.tmp
	TizenProject/.sign/author-signature.xml
	TizenProject/.sign/signature1.xml
abc
Merge branch 'pji3'

Conflicts:
	TizenProject/.sdk_delta.info
	TizenProject/.sign/.manifest.tmp
	TizenProject/.sign/author-signature.xml
	TizenProject/.sign/signature1.xml
remove
sujung
Merge branch 'Gants2'
added id
Merge branch 'Gants2'

Conflicts:
	TizenProject/.rds_delta
	TizenProject/.sdk_delta.info
	TizenProject/.sign/.manifest.tmp
	TizenProject/.sign/author-signature.xml
	TizenProject/.sign/signature1.xml
	TizenProject/src/Chatting.cpp
chatting
commit