Merge "Merge branch 'master' into simulator" into simulator
[platform/upstream/iotivity.git] / resource / csdk / stack / samples / tizen / SimpleClientServer / occlient.h
2015-09-18 Madan LankaMerge "Merge branch 'master' into simulator" into simulator
2015-09-18 Harish Kumara MarappaMerge branch 'master' into simulator
2015-09-17 Jaehong JoMerge remote-tracking branch 'origin/routing-manager'
2015-08-27 Vinil JainMerge branch 'master' into easysetup & CBOR changes
2015-08-05 Sachin AgrawalMerge branch 'master' into 'security-basecamp'
2015-08-03 Harish Kumara MarappaMerge branch 'master' into simulator
2015-07-29 koushik.girijalaRI Sample for Tizen