Merge branch 'master' into easysetup
[platform/upstream/iotivity.git] / resource / src / OCApi.cpp
2014-11-06 William R. DieterRepo Merge: Moving resource API down a directory