Merge branch 'master' into simulator
[platform/upstream/iotivity.git] / resource / csdk / stack / samples / tizen / SimpleClientServer / ocrouting.cpp
2015-09-18 Harish Kumara MarappaMerge branch 'master' into simulator
2015-09-17 Jaehong JoMerge remote-tracking branch 'origin/routing-manager'