Merge branch 'master' into group-manager
[platform/upstream/iotivity.git] / resource / csdk / stack / src / oickeepalive.c
2016-02-24 Jihun HaMerge branch 'master' into group-manager
2016-02-23 jihwan.seoremoved duplicated OC_LOG and replace it with OIC_LOG
2016-02-18 hyuna0213.jokeepalive for coap over tcp